diff options
author | Arnaud Boutonné | 2011-02-11 07:12:29 +0000 |
---|---|---|
committer | Arnaud Boutonné | 2011-02-11 07:12:29 +0000 |
commit | 3c5fb26a913b1b8c97da6a0ef0b6b0f2f1498b4b (patch) | |
tree | c003649b2806e76dc21b9f5eca96b412d10a3413 /engines/hugo/object.h | |
parent | d8d9305c22969e98ac8e0c987ac27e7508ff705c (diff) | |
download | scummvm-rg350-3c5fb26a913b1b8c97da6a0ef0b6b0f2f1498b4b.tar.gz scummvm-rg350-3c5fb26a913b1b8c97da6a0ef0b6b0f2f1498b4b.tar.bz2 scummvm-rg350-3c5fb26a913b1b8c97da6a0ef0b6b0f2f1498b4b.zip |
HUGO: refactoring: move boundaries to object class
svn-id: r55879
Diffstat (limited to 'engines/hugo/object.h')
-rw-r--r-- | engines/hugo/object.h | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/engines/hugo/object.h b/engines/hugo/object.h index 736be20ef1..ce94c79103 100644 --- a/engines/hugo/object.h +++ b/engines/hugo/object.h @@ -42,9 +42,26 @@ public: ObjectHandler(HugoEngine *vm); virtual ~ObjectHandler(); + overlay_t _objBound; + overlay_t _boundary; // Boundary overlay file + overlay_t _overlay; // First overlay file + overlay_t _ovlBase; // First overlay base file + object_t *_objects; uint16 _numObj; + byte getBoundaryOverlay(uint16 index) const { return _boundary[index]; } + byte getObjectBoundary(uint16 index) const { return _objBound[index]; } + byte getBaseBoundary(uint16 index) const { return _ovlBase[index]; } + byte getFirstOverlay(uint16 index) const { return _overlay[index]; } + + int deltaX(const int x1, const int x2, const int vx, int y) const; + int deltaY(const int x1, const int x2, const int vy, const int y) const; + void boundaryCollision(object_t *obj); + void clearBoundary(const int x1, const int x2, const int y); + void clearScreenBoundary(const int x1, const int x2, const int y); + void storeBoundary(const int x1, const int x2, const int y); + virtual void homeIn(const int objIndex1, const int objIndex2, const int8 objDx, const int8 objDy) = 0; virtual void moveObjects() = 0; virtual void updateImages() = 0; |