[Scummvm-cvs-logs] CVS: scummvm/common rect.h,1.3,1.4
Max Horn
fingolfin at users.sourceforge.net
Thu May 15 14:34:05 CEST 2003
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/scumm gfx.cpp,2.101,2.102 gfx.h,1.26,1.27 scumm.h,1.189,1.190
- Next message: [Scummvm-cvs-logs] CVS: scummvm/common rect.h,1.4,1.5 util.h,1.14,1.15
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/common
In directory sc8-pr-cvs1:/tmp/cvs-serv32195
Modified Files:
rect.h
Log Message:
let it compile
Index: rect.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/rect.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- rect.h 15 May 2003 21:25:35 -0000 1.3
+++ rect.h 15 May 2003 21:33:39 -0000 1.4
@@ -36,7 +36,7 @@
Point() : x(0), y(0) {};
Point(const Point & p) : x(p.x), y(p.y) {};
- explicit Point(int x, int y) : x(x), y(y) {};
+ explicit Point(int x1, int y1) : x(x1), y(y1) {};
Point & operator=(const Point & p) { x = p.x; y = p.y; return *this; };
bool operator==(const Point & p) const { return x == p.x && y == p.y; };
};
@@ -51,9 +51,8 @@
int bottom, right; //!< The point at the bottom right of the rectangle (not part of the rect).
Rect() : top(0), left(0), bottom(0), right(0) {}
- Rect(int x, int y) : _topLeft(0, 0), _bottomRight(x, y) {}
+ Rect(int x, int y) : top(0), left(0), bottom(x), right(y) {}
Rect(int x1, int y1, int x2, int y2) : top(x1), left(y1), bottom(x2), right(y2) {}
- Point size() const { return (_bottomRight - _topLeft); };
int width() const { return right - left; }
int height() const { return top - bottom; }
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/scumm gfx.cpp,2.101,2.102 gfx.h,1.26,1.27 scumm.h,1.189,1.190
- Next message: [Scummvm-cvs-logs] CVS: scummvm/common rect.h,1.4,1.5 util.h,1.14,1.15
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list