4 files changed, 15 insertions, 11 deletions
diff --git a/engines/drascula/animation.cpp b/engines/drascula/animation.cpp
index b0877a2e3e..06868494b5 100644
--- a/engines/drascula/animation.cpp
+++ b/engines/drascula/animation.cpp
@@ -372,7 +372,11 @@ void DrasculaEngine::animation_1_1() {
 			break;
 		clearRoom();
 
-		playMusic(2);
+		if (_lang == kSpanish)
+			playMusic(31);
+		else
+			playMusic(2);
+
 		pause(5);
 		playFLI("intro.bin", 12);
 		term_int = 1;
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;
 		}
 	}
diff --git a/engines/drascula/talk.cpp b/engines/drascula/talk.cpp
index 4d3187a0fd..a89c5ff734 100644
--- a/engines/drascula/talk.cpp
+++ b/engines/drascula/talk.cpp
@@ -60,7 +60,7 @@ void DrasculaEngine::talk_igor(int index, int talkerType) {
 	int x_talk1[8] = {  56,  86, 116, 146, 176, 206, 236, 266 };
 	int x_talk3[4] = {  80, 102, 124, 146 };
 	int x_talk4[4] = { 119, 158, 197, 236 };
-	int face;
+	int face = 0;
 	int length = strlen(said);
 
 	color_abc(kColorWhite);