diff options
| author | Strangerke | 2016-05-12 07:53:06 +0200 |
|---|---|---|
| committer | Strangerke | 2016-05-12 07:53:06 +0200 |
| commit | af1cf151de9ffc9d040a4e52b57fe3dfd754969b (patch) | |
| tree | 728eebf4d7f0ac38078b226d4d3b71a14ec07d72 /engines/gnap/scenes/group1.cpp | |
| parent | f467db5ed23cdaa96fb0601ae1b05853f44e3356 (diff) | |
| download | scummvm-rg350-af1cf151de9ffc9d040a4e52b57fe3dfd754969b.tar.gz scummvm-rg350-af1cf151de9ffc9d040a4e52b57fe3dfd754969b.tar.bz2 scummvm-rg350-af1cf151de9ffc9d040a4e52b57fe3dfd754969b.zip | |
GNAP: Use Common::Rect for hotspots
Diffstat (limited to 'engines/gnap/scenes/group1.cpp')
| -rw-r--r-- | engines/gnap/scenes/group1.cpp | 28 |
1 files changed, 11 insertions, 17 deletions
diff --git a/engines/gnap/scenes/group1.cpp b/engines/gnap/scenes/group1.cpp index 0993cf53c4..7aa5d9efdd 100644 --- a/engines/gnap/scenes/group1.cpp +++ b/engines/gnap/scenes/group1.cpp @@ -2068,10 +2068,7 @@ void Scene15::run() { _vm->updateMouseCursor(); _vm->updateCursorByHotspot(); - _vm->_hotspots[kHS15Platypus]._x1 = 0; - _vm->_hotspots[kHS15Platypus]._y1 = 0; - _vm->_hotspots[kHS15Platypus]._x2 = 0; - _vm->_hotspots[kHS15Platypus]._y2 = 0; + _vm->_hotspots[kHS15Platypus].clearRect(); _vm->_sceneClickedHotspot = _vm->getClickedHotspotId(); _vm->updateGrabCursorSprite(0, 0); @@ -3147,23 +3144,20 @@ void Scene18::updateHotspots() { if (_vm->isFlag(kGFTruckFilledWithGas)) { if (_vm->isFlag(kGFTruckKeysUsed)) { _vm->_hotspots[kHS18HydrantTopValve]._flags = SF_DISABLED; - _vm->_hotspots[kHS18HydrantRightValve]._x1 = 148; - _vm->_hotspots[kHS18HydrantRightValve]._y1 = 403; + _vm->_hotspots[kHS18HydrantRightValve]._rect.left = 148; + _vm->_hotspots[kHS18HydrantRightValve]._rect.top = 403; _vm->_hotspots[kHS18GarbageCan]._flags = SF_DISABLED; _vm->_hotspotsWalkPos[kHS18GarbageCan].x = 3; _vm->_hotspotsWalkPos[kHS18GarbageCan].y = 7; } else { - _vm->_hotspots[kHS18HydrantTopValve]._y1 = 246; + _vm->_hotspots[kHS18HydrantTopValve]._rect.top = 246; } } else if (_vm->isFlag(kGFBarnPadlockOpen)) { _vm->_hotspots[kHS18HydrantRightValve]._flags = SF_DISABLED; - _vm->_hotspots[kHS18HydrantTopValve]._x1 = 105; - _vm->_hotspots[kHS18HydrantTopValve]._x2 = 192; + _vm->_hotspots[kHS18HydrantTopValve]._rect.left = 105; + _vm->_hotspots[kHS18HydrantTopValve]._rect.right = 192; } else if (_vm->isFlag(kGFTruckKeysUsed)) { - _vm->_hotspots[kHS18GarbageCan]._x1 = 115; - _vm->_hotspots[kHS18GarbageCan]._y1 = 365; - _vm->_hotspots[kHS18GarbageCan]._x2 = 168; - _vm->_hotspots[kHS18GarbageCan]._y2 = 470; + _vm->_hotspots[kHS18GarbageCan]._rect = Common::Rect(115, 365, 168, 470); _vm->_hotspots[kHS18GarbageCan]._flags = SF_WALKABLE | SF_TALK_CURSOR | SF_GRAB_CURSOR | SF_LOOK_CURSOR; _vm->_hotspotsWalkPos[kHS18GarbageCan].x = 3; _vm->_hotspotsWalkPos[kHS18GarbageCan].y = 7; @@ -3794,11 +3788,11 @@ void Scene18::run() { _vm->clearFlag(kGFPlatypusTalkingToAssistant); } } else { - _vm->_hotspots[kHS18WalkArea1]._y2 += 48; - _vm->_hotspots[kHS18WalkArea2]._x1 += 75; + _vm->_hotspots[kHS18WalkArea1]._rect.bottom += 48; + _vm->_hotspots[kHS18WalkArea2]._rect.left += 75; plat.updateIdleSequence(); - _vm->_hotspots[kHS18WalkArea2]._x1 -= 75; - _vm->_hotspots[kHS18WalkArea1]._y2 -= 48; + _vm->_hotspots[kHS18WalkArea2]._rect.left -= 75; + _vm->_hotspots[kHS18WalkArea1]._rect.bottom -= 48; } if (!_vm->_timers[5]) { _vm->_timers[5] = _vm->getRandom(100) + 100; |