From 1f1d860797029dbe58ea4cc282ff3489768965d5 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Fri, 3 Nov 2017 09:59:49 +0200
Subject: DRASCULA: Merge the floor coordinates into _walkRect

---
 engines/drascula/drascula.cpp | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

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

diff --git a/engines/drascula/drascula.cpp b/engines/drascula/drascula.cpp
index bb126e5307..3f840b0901 100644
--- a/engines/drascula/drascula.cpp
+++ b/engines/drascula/drascula.cpp
@@ -94,10 +94,6 @@ DrasculaEngine::DrasculaEngine(OSystem *syst, const DrasculaGameDescription *gam
 	_talkSequencesSize = 0;
 	_numLangs = 0;
 	feetHeight = 0;
-	floorX1 = 0;
-	floorY1 = 0;
-	floorX2 = 0;
-	floorY2 = 0;
 	lowerLimit = 0;
 	upperLimit = 0;
 	trackFinal = 0;
@@ -768,8 +764,8 @@ bool DrasculaEngine::verify1() {
 		}
 
 		if (doBreak == 0) {
-			roomX = CLIP(_mouseX, floorX1, floorX2);
-			roomY = CLIP(_mouseY, floorY1 + feetHeight, floorY2);
+			roomX = CLIP<int16>(_mouseX, _walkRect.left, _walkRect.right);
+			roomY = CLIP<int16>(_mouseY, _walkRect.top + feetHeight, _walkRect.bottom);
 			startWalking();
 		}
 		doBreak = 0;
-- 
cgit v1.2.3