lleva_vb -> placeVB

c_mirar -> curExcuseLook
c_poder -> curExcuseAction
sentido -> trackCharacter
mirar_t -> lookExcuses
poder_t -> actionExcuses

svn-id: r32535

4 files changed, 40 insertions, 45 deletions

diff --git a/engines/drascula/animation.cpp b/engines/drascula/animation.cpp
index dc29b45c84..d3d6011599 100644
--- a/engines/drascula/animation.cpp
+++ b/engines/drascula/animation.cpp
@@ -1062,7 +1062,7 @@ void DrasculaEngine::animation_23_2() {
 	}
 
 	talk_vb(15);
-	lleva_vb(42);
+	placeVB(42);
 	trackVB = 1;
 	talk_vb(16);
 	trackVB = 2;
@@ -1083,7 +1083,7 @@ void DrasculaEngine::animation_23_2() {
 
 	trackVB = 2;
 	animation_25_2();
-	lleva_vb(99);
+	placeVB(99);
 
 	if (flags[29] == 0) {
 		talk_vb(19);
@@ -1243,7 +1243,7 @@ void DrasculaEngine::animation_30_2() {
 
 void DrasculaEngine::animation_31_2() {
 	talk_vb(44);
-	lleva_vb(-50);
+	placeVB(-50);
 	pause(15);
 	gotoObject(159, 140);
 	loadPic(99, backSurface);
@@ -1256,7 +1256,7 @@ void DrasculaEngine::animation_31_2() {
 	updateScreen();
 	pause(22);
 	talk(406);
-	lleva_vb(98);
+	placeVB(98);
 	talk_vb(45);
 	talk_vb(46);
 	talk_vb(47);
diff --git a/engines/drascula/drascula.cpp b/engines/drascula/drascula.cpp
index 89f6e36f76..7675bd9fa2 100644
--- a/engines/drascula/drascula.cpp
+++ b/engines/drascula/drascula.cpp
@@ -142,8 +142,8 @@ int DrasculaEngine::go() {
 		frame_blind = 0;
 		frame_snore = 0;
 		frame_bat = 0;
-		c_mirar = 0;
-		c_poder = 0;
+		curExcuseLook = 0;
+		curExcuseAction = 0;
 
 		allocMemory();
 
@@ -850,7 +850,7 @@ void DrasculaEngine::enterRoom(int roomIndex) {
 			getStringFromLine(buffer, size, _targetSurface[l]);
 			getIntFromLine(buffer, size, &_destX[l]);
 			getIntFromLine(buffer, size, &_destY[l]);
-			getIntFromLine(buffer, size, &sentido_alkeva[l]);
+			getIntFromLine(buffer, size, &trackCharacter_alkeva[l]);
 			getIntFromLine(buffer, size, &alapuertakeva[l]);
 			updateDoor(l);
 		}
@@ -1938,7 +1938,7 @@ void DrasculaEngine::placeBJ() {
 }
 
 void DrasculaEngine::hiccup(int counter) {
-	int y = 0, sentido = 0;
+	int y = 0, trackCharacter = 0;
 	if (currentChapter == 3)
 		y = -1;
 
@@ -1951,21 +1951,21 @@ void DrasculaEngine::hiccup(int counter) {
 		else
 			updateScreen(0, 1, 0, y, 320, 198, screenSurface);
 
-		if (sentido == 0)
+		if (trackCharacter == 0)
 			y++;
 		else
 			y--;
 
 		if (currentChapter == 3) {
 			if (y == 1)
-				sentido = 1;
+				trackCharacter = 1;
 			if (y == -1)
-				sentido = 0;
+				trackCharacter = 0;
 		} else {
 			if (y == 2)
-				sentido = 1;
+				trackCharacter = 1;
 			if (y == 0)
-				sentido = 0;
+				trackCharacter = 0;
 		}
 	} while (counter > 0);
 
@@ -2422,7 +2422,7 @@ bool DrasculaEngine::exitRoom(int l) {
 				updateRoom();
 				updateScreen();
 				characterMoved = 0;
-				trackProtagonist = sentido_alkeva[l];
+				trackProtagonist = trackCharacter_alkeva[l];
 				objExit = alapuertakeva[l];
 				doBreak = 1;
 				previousMusic = roomMusic;
@@ -2442,7 +2442,7 @@ bool DrasculaEngine::exitRoom(int l) {
 		if (isDoor[l] != 0) {
 			gotoObject(roomObjX[l], roomObjY[l]);
 			characterMoved = 0;
-			trackProtagonist = sentido_alkeva[l];
+			trackProtagonist = trackCharacter_alkeva[l];
 			objExit = alapuertakeva[l];
 			doBreak = 1;
 			previousMusic = roomMusic;
@@ -2475,7 +2475,7 @@ bool DrasculaEngine::exitRoom(int l) {
 			updateRoom();
 			updateScreen();
 			characterMoved = 0;
-			trackProtagonist = sentido_alkeva[l];
+			trackProtagonist = trackCharacter_alkeva[l];
 			objExit = alapuertakeva[l];
 			doBreak = 1;
 			previousMusic = roomMusic;
@@ -2492,7 +2492,7 @@ bool DrasculaEngine::exitRoom(int l) {
 			updateRoom();
 			updateScreen();
 			characterMoved = 0;
-			trackProtagonist = sentido_alkeva[l];
+			trackProtagonist = trackCharacter_alkeva[l];
 			objExit = alapuertakeva[l];
 			doBreak = 1;
 			previousMusic = roomMusic;
@@ -2512,7 +2512,7 @@ bool DrasculaEngine::exitRoom(int l) {
 			updateRoom();
 			updateScreen();
 			characterMoved = 0;
-			trackProtagonist = sentido_alkeva[l];
+			trackProtagonist = trackCharacter_alkeva[l];
 			objExit = alapuertakeva[l];
 			doBreak = 1;
 			previousMusic = roomMusic;
@@ -2530,7 +2530,7 @@ bool DrasculaEngine::exitRoom(int l) {
 			updateRoom();
 			updateScreen();
 			characterMoved = 0;
-			trackProtagonist = sentido_alkeva[l];
+			trackProtagonist = trackCharacter_alkeva[l];
 			objExit = alapuertakeva[l];
 			doBreak = 1;
 			previousMusic = roomMusic;
@@ -3516,7 +3516,7 @@ void DrasculaEngine::moveVB() {
 	copyRectClip(pos_vb, frontSurface, screenSurface);
 }
 
-void DrasculaEngine::lleva_vb(int pointX) {
+void DrasculaEngine::placeVB(int pointX) {
 	trackVB = (pointX < vbX) ? 0 : 1;
 	vbHasMoved = 1;
 
@@ -3539,7 +3539,7 @@ void DrasculaEngine::lleva_vb(int pointX) {
 }
 
 void DrasculaEngine::hipo_sin_nadie(int counter){
-	int y = 0, sentido = 0;
+	int y = 0, trackCharacter = 0;
 	if (currentChapter == 3)
 		y = -1;
 
@@ -3552,21 +3552,21 @@ void DrasculaEngine::hipo_sin_nadie(int counter){
 		else
 			updateScreen(0, 1, 0, y, 320, 198, screenSurface);
 
-		if (sentido == 0)
+		if (trackCharacter == 0)
 			y++;
 		else
 			y--;
 
 		if (currentChapter == 3) {
 			if (y == 1)
-				sentido = 1;
+				trackCharacter = 1;
 			if (y == -1)
-				sentido = 0;
+				trackCharacter = 0;
 		} else {
 			if (y == 2)
-				sentido = 1;
+				trackCharacter = 1;
 			if (y == 0)
-				sentido = 0;
+				trackCharacter = 0;
 		}
 	} while (counter > 0);
 
diff --git a/engines/drascula/drascula.h b/engines/drascula/drascula.h
index 600b80d4be..79a388ab31 100644
--- a/engines/drascula/drascula.h
+++ b/engines/drascula/drascula.h
@@ -250,7 +250,7 @@ public:
 	int roomObjX[40], roomObjY[40], trackObj[40];
 	int inventoryObjects[43];
 	char _targetSurface[40][20];
-	int _destX[40], _destY[40], sentido_alkeva[40], alapuertakeva[40];
+	int _destX[40], _destY[40], trackCharacter_alkeva[40], alapuertakeva[40];
 	int x1[40], y1[40], x2[40], y2[40];
 	int takeObject, pickedObject;
 	int withVoices;
@@ -259,8 +259,8 @@ public:
 	int frame_blind;
 	int frame_snore;
 	int frame_bat;
-	int c_mirar;
-	int c_poder;
+	int curExcuseLook;
+	int curExcuseAction;
 
 	int flags[NUM_FLAGS];
 
@@ -312,7 +312,7 @@ public:
 	void walkUp();
 	void walkDown();
 	void moveVB();
-	void lleva_vb(int pointX);
+	void placeVB(int pointX);
 	void hipo_sin_nadie(int counter);
 	void openDoor(int nflag, int doorNum);
 	void showMap();
diff --git a/engines/drascula/rooms.cpp b/engines/drascula/rooms.cpp
index 647917148a..532f31e0ac 100644
--- a/engines/drascula/rooms.cpp
+++ b/engines/drascula/rooms.cpp
@@ -50,8 +50,8 @@ bool DrasculaEngine::roomParse(RoomTalkAction* roomActions, int fl) {
 }
 
 void DrasculaEngine::room_0() {
-	static const int mirar_t[3] = {100, 101, 54};
-	static const int poder_t[6] = {11, 109, 111, 110, 115, 116};
+	static const int lookExcuses[3] = {100, 101, 54};
+	static const int actionExcuses[6] = {11, 109, 111, 110, 115, 116};
 
 	if (roomParse(room0Actions, -1))
 		return;
@@ -60,20 +60,15 @@ void DrasculaEngine::room_0() {
 	if (currentChapter == 2 || currentChapter == 4 ||
 		currentChapter == 5 || currentChapter == 6) {
 		if (pickedObject == kVerbLook) {
-			talk(mirar_t[c_mirar]);
-			c_mirar++;
-			if (c_mirar == 3)
-				c_mirar = 0;
-		} else if (pickedObject == kVerbPick) {
-			talk(poder_t[c_poder]);
-			c_poder++;
-			if (c_poder == 6)
-				c_poder = 0;
+			talk(lookExcuses[curExcuseLook]);
+			curExcuseLook++;
+			if (curExcuseLook == 3)
+				curExcuseLook = 0;
 		} else {
-			talk(poder_t[c_poder]);
-			c_poder++;
-			if (c_poder == 6)
-				c_poder = 0;
+			talk(actionExcuses[curExcuseAction]);
+			curExcuseAction++;
+			if (curExcuseAction == 6)
+				curExcuseAction = 0;
 		}
 	}
 }