diff options
| author | Willem Jan Palenstijn | 2017-11-14 19:13:48 +0100 |
|---|---|---|
| committer | Willem Jan Palenstijn | 2017-11-14 19:14:00 +0100 |
| commit | bf69b25e33189581848412e77624865aa55ba234 (patch) | |
| tree | 9b45f9c606a7060afdccee9a4c8768357ad7d4f3 /engines/drascula/drascula.h | |
| parent | c8d3429ab47cdc484b8ab042c9686d976c17ea64 (diff) | |
| download | scummvm-rg350-bf69b25e33189581848412e77624865aa55ba234.tar.gz scummvm-rg350-bf69b25e33189581848412e77624865aa55ba234.tar.bz2 scummvm-rg350-bf69b25e33189581848412e77624865aa55ba234.zip | |
DRASCULA: Revert range 4dbed774..1f1d8607
This reverts
1f1d8607 DRASCULA: Merge the floor coordinates into _walkRect
1e1b6f7c DRASCULA: Rename gotoObject() to walkToPoint() and simplify it
2bf05c2a DRASCULA: Clean up room variables, and simplify some related checks
Reverting due to unanswered questions about why the changes in behaviour
in 2bf05c2a746065f373ac136c994714dae376cdbc are correct.
Diffstat (limited to 'engines/drascula/drascula.h')
| -rw-r--r-- | engines/drascula/drascula.h | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/engines/drascula/drascula.h b/engines/drascula/drascula.h index a7eadcd069..fbc29ed206 100644 --- a/engines/drascula/drascula.h +++ b/engines/drascula/drascula.h @@ -420,13 +420,11 @@ public: char iconName[44][13]; int objectNum[40], visible[40], isDoor[40]; - int trackObj[40]; - Common::Point _roomObject[40]; + int roomObjX[40], roomObjY[40], trackObj[40]; int inventoryObjects[43]; - int _doorDestRoom[40]; - Common::Point _doorDestPoint[40]; - int trackCharacter_alkeva[40], _roomExitId[40]; - Common::Rect _objectRect[40]; + char _targetSurface[40][20]; + int _destX[40], _destY[40], trackCharacter_alkeva[40], roomExits[40]; + int _objectX1[40], _objectY1[40], _objectX2[40], _objectY2[40]; int takeObject, pickedObject; bool _subtitlesDisabled; bool _menuBar, _menuScreen, _hasName; @@ -443,7 +441,7 @@ public: int doBreak; int stepX, stepY; int curHeight, curWidth, feetHeight; - Common::Rect _walkRect; + int floorX1, floorY1, floorX2, floorY2; int lowerLimit, upperLimit; int trackFinal; bool _walkToObject; @@ -487,7 +485,7 @@ public: void enterRoom(int); void clearRoom(); - void walkToPoint(Common::Point pos); + void gotoObject(int, int); void moveCursor(); void checkObjects(); void selectVerbFromBar(); |