diff options
| author | Filippos Karapetis | 2017-11-03 09:42:07 +0200 |
|---|---|---|
| committer | Filippos Karapetis | 2017-11-11 17:14:38 +0200 |
| commit | 2bf05c2a746065f373ac136c994714dae376cdbc (patch) | |
| tree | ac89bc6299545b3e5e60f9b8bfed8e0a3c040e19 /engines/drascula/drascula.cpp | |
| parent | 4dbed7742afea3afc414d9550378f5c98709ad29 (diff) | |
| download | scummvm-rg350-2bf05c2a746065f373ac136c994714dae376cdbc.tar.gz scummvm-rg350-2bf05c2a746065f373ac136c994714dae376cdbc.tar.bz2 scummvm-rg350-2bf05c2a746065f373ac136c994714dae376cdbc.zip | |
DRASCULA: Clean up room variables, and simplify some related checks
Diffstat (limited to 'engines/drascula/drascula.cpp')
| -rw-r--r-- | engines/drascula/drascula.cpp | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/engines/drascula/drascula.cpp b/engines/drascula/drascula.cpp index 1f3f0c654d..bf333d6575 100644 --- a/engines/drascula/drascula.cpp +++ b/engines/drascula/drascula.cpp @@ -744,8 +744,7 @@ bool DrasculaEngine::verify1() { removeObject(); else { for (l = 0; l < numRoomObjs; l++) { - if (_mouseX >= _objectX1[l] && _mouseY >= _objectY1[l] - && _mouseX <= _objectX2[l] && _mouseY <= _objectY2[l] && doBreak == 0) { + if (_objectRect[l].contains(Common::Point(_mouseX, _mouseY)) && doBreak == 0) { if (exitRoom(l)) return true; if (doBreak == 1) @@ -758,10 +757,9 @@ bool DrasculaEngine::verify1() { doBreak = 1; for (l = 0; l < numRoomObjs; l++) { - if (_mouseX > _objectX1[l] && _mouseY > _objectY1[l] - && _mouseX < _objectX2[l] && _mouseY < _objectY2[l] && doBreak == 0) { - roomX = roomObjX[l]; - roomY = roomObjY[l]; + if (_objectRect[l].contains(Common::Point(_mouseX, _mouseY)) && doBreak == 0) { + roomX = _roomObject[l].x; + roomY = _roomObject[l].y; trackFinal = trackObj[l]; doBreak = 1; _walkToObject = true; @@ -792,11 +790,10 @@ bool DrasculaEngine::verify2() { return true; } else { for (l = 0; l < numRoomObjs; l++) { - if (_mouseX > _objectX1[l] && _mouseY > _objectY1[l] - && _mouseX < _objectX2[l] && _mouseY < _objectY2[l] && visible[l] == 1) { + if (_objectRect[l].contains(Common::Point(_mouseX, _mouseY)) && visible[l] == 1) { trackFinal = trackObj[l]; _walkToObject = true; - gotoObject(roomObjX[l], roomObjY[l]); + gotoObject(_roomObject[l].x, _roomObject[l].y); if (checkAction(objectNum[l])) return true; if (currentChapter == 4) |