diff options
| author | Eugene Sandulenko | 2005-04-16 20:59:24 +0000 |
|---|---|---|
| committer | Eugene Sandulenko | 2005-04-16 20:59:24 +0000 |
| commit | 44acfd9467e126d324a6ac730dccedd30c916480 (patch) | |
| tree | fed123167f011ddcec3a44879993d126e1eb8130 /saga/objectmap.h | |
| parent | aea451f092a90bdc28bc8bd82508ec40b9920868 (diff) | |
| download | scummvm-rg350-44acfd9467e126d324a6ac730dccedd30c916480.tar.gz scummvm-rg350-44acfd9467e126d324a6ac730dccedd30c916480.tar.bz2 scummvm-rg350-44acfd9467e126d324a6ac730dccedd30c916480.zip | |
Implement sfGetDeltaFrame and sfEnableZone. Fixes freeze when sanctuary
gates open and also used in world map.
Spelling and indentation fixes here and there.
svn-id: r17640
Diffstat (limited to 'saga/objectmap.h')
| -rw-r--r-- | saga/objectmap.h | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/saga/objectmap.h b/saga/objectmap.h index dc97271912..76a45dd284 100644 --- a/saga/objectmap.h +++ b/saga/objectmap.h @@ -37,8 +37,8 @@ private: int pointsCount; Point *points; }; + public: - HitZone(MemoryReadStreamEndian *readStream, int index); ~HitZone(); @@ -60,6 +60,12 @@ public: int getFlags() const { return _flags; } + void setFlag(HitZoneFlags flag) { + _flags |= flag; + } + void clearFlag(HitZoneFlags flag) { + _flags &= ~flag; + } int getDirection() const { return ((_flags >> 4) & 0xF); } @@ -72,6 +78,7 @@ public: bool getSpecialPoint(Point &specialPoint) const; void draw(SURFACE *ds, int color); bool hitTest(const Point &testPoint); + private: int _flags; // Saga::HitZoneFlags int _clickAreasCount; @@ -99,7 +106,7 @@ public: void draw(SURFACE *drawSurface, const Point& testPoint, int color, int color2); int hitTest(const Point& testPoint); - const HitZone * getHitZone(int index) const { + HitZone *getHitZone(int16 index) { if ((index < 0) || (index >= _hitZoneListCount)) { error("ObjectMap::getHitZone wrong index 0x%X", index); } |