From 9654ee4fa3e6ba5fab6fda321542e150a27193b8 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Wed, 25 Jun 2008 08:36:07 +0000
Subject: Possible fix for (for the drascula engine) for bug #2001583 - "WINCE:
 CRUISE and DRASCULA engines can not be compiled"

svn-id: r32777
---
 engines/drascula/drascula.h |  2 +-
 engines/drascula/rooms.cpp  | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'engines')

diff --git a/engines/drascula/drascula.h b/engines/drascula/drascula.h
index 567d894b75..8bb73d8dd1 100644
--- a/engines/drascula/drascula.h
+++ b/engines/drascula/drascula.h
@@ -328,7 +328,7 @@ public:
 	int curHeight, curWidth, feetHeight;
 	int talkHeight, talkWidth;
 	int floorX1, floorY1, floorX2, floorY2;
-	int near, far;
+	int lowerLimit, upperLimit;
 	int trackFinal, walkToObject;
 	int objExit;
 	int timeDiff, startTime;
diff --git a/engines/drascula/rooms.cpp b/engines/drascula/rooms.cpp
index 6fe28bdbdc..37dddf4b7e 100644
--- a/engines/drascula/rooms.cpp
+++ b/engines/drascula/rooms.cpp
@@ -1672,8 +1672,8 @@ void DrasculaEngine::enterRoom(int roomIndex) {
 	getIntFromLine(buffer, size, &floorY2);
 
 	if (currentChapter != 2) {
-		getIntFromLine(buffer, size, &far);
-		getIntFromLine(buffer, size, &near);
+		getIntFromLine(buffer, size, &upperLimit);
+		getIntFromLine(buffer, size, &lowerLimit);
 	}
 	_arj.close();
 
@@ -1732,27 +1732,27 @@ void DrasculaEngine::enterRoom(int roomIndex) {
 
 	if (currentChapter != 2) {
 		for (l = 0; l <= floorY1; l++)
-			factor_red[l] = far;
+			factor_red[l] = upperLimit;
 		for (l = floorY1; l <= 201; l++)
-			factor_red[l] = near;
+			factor_red[l] = lowerLimit;
 
-		chiquez = (float)(near - far) / (float)(floorY2 - floorY1);
+		chiquez = (float)(lowerLimit - upperLimit) / (float)(floorY2 - floorY1);
 		for (l = floorY1; l <= floorY2; l++) {
-			factor_red[l] = (int)(far + pequegnez);
+			factor_red[l] = (int)(upperLimit + pequegnez);
 			pequegnez = pequegnez + chiquez;
 		}
 	}
 
 	if (roomNumber == 24) {
 		for (l = floorY1 - 1; l > 74; l--) {
-			factor_red[l] = (int)(far - pequegnez);
+			factor_red[l] = (int)(upperLimit - pequegnez);
 			pequegnez = pequegnez + chiquez;
 		}
 	}
 
 	if (currentChapter == 5 && roomNumber == 54) {
 		for (l = floorY1 - 1; l > 84; l--) {
-			factor_red[l] = (int)(far - pequegnez);
+			factor_red[l] = (int)(upperLimit - pequegnez);
 			pequegnez = pequegnez + chiquez;
 		}
 	}
-- 
cgit v1.2.3