[Scummvm-cvs-logs] scummvm master -> 351af76f9bce9b78ef10cb403c635e7b121e883b
sev-
sev at scummvm.org
Mon Jul 29 11:27:18 CEST 2013
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
351af76f9b COMMON: Added copy constructors and copier to Rect and Point.
Commit: 351af76f9bce9b78ef10cb403c635e7b121e883b
https://github.com/scummvm/scummvm/commit/351af76f9bce9b78ef10cb403c635e7b121e883b
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-07-29T02:25:57-07:00
Commit Message:
COMMON: Added copy constructors and copier to Rect and Point.
Changed paths:
common/rect.h
diff --git a/common/rect.h b/common/rect.h
index 5790cf7..31e0b51 100644
--- a/common/rect.h
+++ b/common/rect.h
@@ -38,11 +38,14 @@ struct Point {
Point() : x(0), y(0) {}
Point(int16 x1, int16 y1) : x(x1), y(y1) {}
+ Point(const Point &p) : x(p.x), y(p.y) {}
bool operator==(const Point &p) const { return x == p.x && y == p.y; }
bool operator!=(const Point &p) const { return x != p.x || y != p.y; }
Point operator+(const Point &delta) const { return Point(x + delta.x, y + delta.y); }
Point operator-(const Point &delta) const { return Point(x - delta.x, y - delta.y); }
+ void copy(const Point &p) { x = p.x; y = p.y; }
+
void operator+=(const Point &delta) {
x += delta.x;
y += delta.y;
@@ -99,9 +102,12 @@ struct Rect {
Rect(int16 x1, int16 y1, int16 x2, int16 y2) : top(y1), left(x1), bottom(y2), right(x2) {
assert(isValidRect());
}
+ Rect(const Rect &r) : top(r.top), left(r.left), bottom(r.bottom), right(r.right) {}
bool operator==(const Rect &rhs) const { return equals(rhs); }
bool operator!=(const Rect &rhs) const { return !equals(rhs); }
+ void copy(const Rect &r) { top = r.top; left = r.left; bottom = r.bottom; right = r.right; }
+
int16 width() const { return right - left; }
int16 height() const { return bottom - top; }
More information about the Scummvm-git-logs
mailing list