aboutsummaryrefslogtreecommitdiff
path: root/common/rect.h
diff options
context:
space:
mode:
authorEugene Sandulenko2013-07-29 12:30:47 +0300
committerEugene Sandulenko2013-07-29 12:30:47 +0300
commit67af740f3ae63b2f1f1ccf643f7eb51888d6de9b (patch)
tree63c964e2bbf29ee4166d10a84b149500443f4e1b /common/rect.h
parent351af76f9bce9b78ef10cb403c635e7b121e883b (diff)
downloadscummvm-rg350-67af740f3ae63b2f1f1ccf643f7eb51888d6de9b.tar.gz
scummvm-rg350-67af740f3ae63b2f1f1ccf643f7eb51888d6de9b.tar.bz2
scummvm-rg350-67af740f3ae63b2f1f1ccf643f7eb51888d6de9b.zip
COMMON: Revert last commit as rightfully pointed out by fuzze.
Diffstat (limited to 'common/rect.h')
-rw-r--r--common/rect.h6
1 files changed, 0 insertions, 6 deletions
diff --git a/common/rect.h b/common/rect.h
index 31e0b5152f..5790cf7c0f 100644
--- a/common/rect.h
+++ b/common/rect.h
@@ -38,14 +38,11 @@ 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;
@@ -102,12 +99,9 @@ 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; }