From bf69b25e33189581848412e77624865aa55ba234 Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn
Date: Tue, 14 Nov 2017 19:13:48 +0100
Subject: 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.
---
 engines/drascula/drascula.h | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

(limited to 'engines/drascula/drascula.h')

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();
-- 
cgit v1.2.3