diferencia -> difference

pos_pixel -> pixelPos
hare_se_mueve -> characterMoved
pixel_x/pixel_y -> pixelX/pixelY
vez() -> getTime()
menu_sin_volcar() -> showMenu()

Removed unused function codifica()

svn-id: r32380

4 files changed, 101 insertions, 106 deletions

diff --git a/engines/drascula/animation.cpp b/engines/drascula/animation.cpp
index 175f502ee2..33648454bd 100644
--- a/engines/drascula/animation.cpp
+++ b/engines/drascula/animation.cpp
@@ -32,7 +32,7 @@ static const int interf_y[] ={ 51, 51, 51, 51, 83, 83, 83 };
 
 void DrasculaEngine::animation_1_1() {
 	int l, l2, p;
-	int pos_pixel[6];
+	int pixelPos[6];
 
 	while (term_int == 0) {
 		playMusic(29);
@@ -130,19 +130,19 @@ void DrasculaEngine::animation_1_1() {
 				break;
 
 		l2 = 0; p = 0;
-		pos_pixel[3] = 45;
-		pos_pixel[4] = 63;
-		pos_pixel[5] = 31;
+		pixelPos[3] = 45;
+		pixelPos[4] = 63;
+		pixelPos[5] = 31;
 
 		for (l = 0; l < 180; l++) {
 			copyBackground(0, 0, 320 - l, 0, l, 200, drawSurface3, screenSurface);
 			copyBackground(l, 0, 0, 0, 320 - l, 200, drawSurface1, screenSurface);
 
-			pos_pixel[0] = interf_x[l2];
-			pos_pixel[1] = interf_y[l2];
-			pos_pixel[2] = 156 - l;
+			pixelPos[0] = interf_x[l2];
+			pixelPos[1] = interf_y[l2];
+			pixelPos[2] = 156 - l;
 
-			copyRectClip(pos_pixel, drawSurface2, screenSurface);
+			copyRectClip(pixelPos, drawSurface2, screenSurface);
 			updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
 			p++;
 			if (p == 6) {
@@ -1766,7 +1766,7 @@ void DrasculaEngine::animation_6_3() {
 	int yoda_x[] = { 3 ,82, 161, 240, 3, 82 };
 	int yoda_y[] = { 3, 3, 3, 3, 94, 94 };
 
-	hare_se_mueve = 0;
+	characterMoved = 0;
 	flags[3] = 1;
 	updateRoom();
 	updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
@@ -1885,7 +1885,7 @@ void DrasculaEngine::animation_1_5() {
 		talk_bj(21);
 
 		for (;;) {
-			if (hare_se_mueve == 0)
+			if (characterMoved == 0)
 				break;
 			updateRoom();
 			updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
@@ -1937,7 +1937,7 @@ void DrasculaEngine::animation_5_5(){
 	int hueso_x[] = {1, 99, 197, 1, 99, 197, 1, 99, 197};
 	int hueso_y[] = {1, 1, 1, 66, 66, 66, 131, 131, 131};
 	int vuela_x[] = {1, 63, 125, 187, 249};
-	int pixel_x = hare_x - 53, pixel_y = hare_y - 9;
+	int pixelX = hare_x - 53, pixelY = hare_y - 9;
 
 	withoutVerb();
 	removeObject(8);
@@ -1955,8 +1955,8 @@ void DrasculaEngine::animation_5_5(){
 	for (frame = 0; frame < 9; frame++) {
 		pause(3);
 		copyBackground(0, 0, 0, 0, 320, 200, drawSurface1, screenSurface);
-		copyRect(hueso_x[frame], hueso_y[frame], pixel_x, pixel_y, 97, 64, backSurface, screenSurface);
-		updateScreen(pixel_x, pixel_y, pixel_x,pixel_y, 97,64, screenSurface);
+		copyRect(hueso_x[frame], hueso_y[frame], pixelX, pixelY, 97, 64, backSurface, screenSurface);
+		updateScreen(pixelX, pixelY, pixelX,pixelY, 97,64, screenSurface);
 	}
 
 	copyBackground(52, 161, 198, 81, 26, 24, drawSurface3, screenSurface);
@@ -1965,8 +1965,8 @@ void DrasculaEngine::animation_5_5(){
 	for (frame = 0; frame < 9; frame++) {
 		pause(3);
 		copyBackground(0, 0, 0, 0, 320, 200, drawSurface1, screenSurface);
-		copyRect(hueso_x[frame], hueso_y[frame], pixel_x, pixel_y, 97, 64, frontSurface, screenSurface);
-		updateScreen(pixel_x, pixel_y, pixel_x,pixel_y, 97, 64, screenSurface);
+		copyRect(hueso_x[frame], hueso_y[frame], pixelX, pixelY, 97, 64, frontSurface, screenSurface);
+		updateScreen(pixelX, pixelY, pixelX,pixelY, 97, 64, screenSurface);
 	}
 
 	flags[6] = 1;
@@ -2168,7 +2168,7 @@ void DrasculaEngine::animation_12_5() {
 	hare_se_ve = 1;
 	clearRoom();
 	sentido_hare = 1;
-	hare_se_mueve = 0;
+	characterMoved = 0;
 	hare_x = -1;
 	objExit = 104;
 	withoutVerb();
diff --git a/engines/drascula/drascula.cpp b/engines/drascula/drascula.cpp
index 26761da8d6..e4dfa910b3 100644
--- a/engines/drascula/drascula.cpp
+++ b/engines/drascula/drascula.cpp
@@ -165,7 +165,7 @@ int DrasculaEngine::go() {
 		takeObject = 0;
 		menuBar = 0; menuScreen = 0; hasName = 0;
 		frame_y = 0;
-		hare_x = -1; hare_se_mueve = 0; sentido_hare = 3; num_frame = 0; hare_se_ve = 1;
+		hare_x = -1; characterMoved = 0; sentido_hare = 3; num_frame = 0; hare_se_ve = 1;
 		checkFlags = 1;
 		doBreak = 0;
 		walkToObject = 0;
@@ -634,11 +634,11 @@ bool DrasculaEngine::escoba() {
 	}
 
 bucles:
-	if (hare_se_mueve == 0) {
+	if (characterMoved == 0) {
 		stepX = PASO_HARE_X;
 		stepY = PASO_HARE_Y;
 	}
-	if (hare_se_mueve == 0 && walkToObject == 1) {
+	if (characterMoved == 0 && walkToObject == 1) {
 		sentido_hare = sentido_final;
 		walkToObject = 0;
 	}
@@ -683,7 +683,7 @@ bucles:
 	}
 	if (button_dch == 1 && menuScreen == 0) {
 		delay(100);
-		hare_se_mueve = 0;
+		characterMoved = 0;
 		if (sentido_hare == 2)
 			sentido_hare = 1;
 		if (num_ejec == 4)
@@ -1047,7 +1047,7 @@ void DrasculaEngine::carga_escoba(const char *nom_fich) {
 			hare_x = x_alakeva[obj_salir];
 			hare_y = y_alakeva[obj_salir] - alto_hare;
 		}
-		hare_se_mueve = 0;
+		characterMoved = 0;
 	}
 	loadPic(roomDisk);
 	decompressPic(drawSurface3, 1);
@@ -1111,7 +1111,7 @@ void DrasculaEngine::carga_escoba(const char *nom_fich) {
 			alto_hare = (CHARACTER_HEIGHT * factor_red[hare_y]) / 100;
 			ancho_hare = (CHARACTER_WIDTH * factor_red[hare_y]) / 100;
 		}
-		hare_se_mueve = 0;
+		characterMoved = 0;
 	}
 
 	if (num_ejec == 2) {
@@ -1151,11 +1151,11 @@ void DrasculaEngine::carga_escoba(const char *nom_fich) {
 
 	if (num_ejec == 2) {
 		if (roomNumber == 9 || roomNumber == 2 || roomNumber == 14 || roomNumber == 18)
-			conta_blind_vez = vez();
+			conta_blind_vez = getTime();
 	}
 	if (num_ejec == 4) {
 		if (roomNumber == 26)
-			conta_blind_vez = vez();
+			conta_blind_vez = getTime();
 	}
 
 	if (num_ejec == 4 && roomNumber == 24 && flags[29] == 1)
@@ -1194,7 +1194,7 @@ void DrasculaEngine::lleva_al_hare(int pointX, int pointY) {
 	for (;;) {
 		updateRoom();
 		updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
-		if (hare_se_mueve == 0)
+		if (characterMoved == 0)
 			break;
 	}
 
@@ -1223,7 +1223,7 @@ void DrasculaEngine::moveCursor() {
 	if (hasName == 1 && menuScreen == 0)
 		centerText(textName, mouseX, mouseY);
 	if (menuScreen == 1)
-		menu_sin_volcar();
+		showMenu();
 	else if (menuBar == 1)
 		clearMenu();
 
@@ -2397,7 +2397,7 @@ void DrasculaEngine::hare_claro() {
 }
 
 void DrasculaEngine::startWalking() {
-	hare_se_mueve = 1;
+	characterMoved = 1;
 
 	stepX = PASO_HARE_X;
 	stepY = PASO_HARE_Y;
@@ -2425,25 +2425,25 @@ void DrasculaEngine::startWalking() {
 		else if ((sitio_x > hare_x + ancho_hare / 2) && (sitio_y > (hare_y + alto_hare)))
 			quadrant_4();
 		else
-			hare_se_mueve = 0;
+			characterMoved = 0;
 	}
-	conta_vez = vez();
+	conta_vez = getTime();
 }
 
 void DrasculaEngine::pon_hare() {
 	int pos_hare[6];
 	int r;
 
-	if (hare_se_mueve == 1 && stepX == PASO_HARE_X) {
+	if (characterMoved == 1 && stepX == PASO_HARE_X) {
 		for (r = 0; r < stepX; r++) {
 			if (num_ejec != 2) {
 				if (sentido_hare == 0 && sitio_x - r == hare_x + ancho_hare / 2) {
-					hare_se_mueve = 0;
+					characterMoved = 0;
 					stepX = PASO_HARE_X;
 					stepY = PASO_HARE_Y;
 				}
 				if (sentido_hare == 1 && sitio_x + r == hare_x + ancho_hare / 2) {
-					hare_se_mueve = 0;
+					characterMoved = 0;
 					stepX = PASO_HARE_X;
 					stepY = PASO_HARE_Y;
 					hare_x = sitio_x - ancho_hare / 2;
@@ -2451,12 +2451,12 @@ void DrasculaEngine::pon_hare() {
 				}
 			} else if (num_ejec == 2) {
 				if (sentido_hare == 0 && sitio_x - r == hare_x) {
-					hare_se_mueve = 0;
+					characterMoved = 0;
 					stepX = PASO_HARE_X;
 					stepY = PASO_HARE_Y;
 				}
 				if (sentido_hare == 1 && sitio_x + r == hare_x + ancho_hare) {
-					hare_se_mueve = 0;
+					characterMoved = 0;
 					stepX = PASO_HARE_X;
 					stepY = PASO_HARE_Y;
 					hare_x = sitio_x - ancho_hare + 4;
@@ -2465,15 +2465,15 @@ void DrasculaEngine::pon_hare() {
 			}
 		}
 	}
-	if (hare_se_mueve == 1 && stepY == PASO_HARE_Y) {
+	if (characterMoved == 1 && stepY == PASO_HARE_Y) {
 		for (r = 0; r < stepY; r++) {
 			if (sentido_hare == 2 && sitio_y - r == hare_y + alto_hare) {
-				hare_se_mueve = 0;
+				characterMoved = 0;
 				stepX = PASO_HARE_X;
 				stepY = PASO_HARE_Y;
 			}
 			if (sentido_hare == 3 && sitio_y + r == hare_y + alto_hare) {
-				hare_se_mueve = 0;
+				characterMoved = 0;
 				stepX = PASO_HARE_X;
 				stepY = PASO_HARE_Y;
 			}
@@ -2487,7 +2487,7 @@ void DrasculaEngine::pon_hare() {
 		}
 	}
 
-	if (hare_se_mueve == 0) {
+	if (characterMoved == 0) {
 		pos_hare[0] = 0;
 		pos_hare[1] = DIF_MASK_HARE;
 		pos_hare[2] = hare_x;
@@ -2526,7 +2526,7 @@ void DrasculaEngine::pon_hare() {
 				reduce_hare_chico(pos_hare[0], pos_hare[1], pos_hare[2], pos_hare[3], pos_hare[4], pos_hare[5],
 									factor_red[hare_y + alto_hare], frontSurface, screenSurface);
 		}
-	} else if (hare_se_mueve == 1) {
+	} else if (characterMoved == 1) {
 		pos_hare[0] = frame_x[num_frame];
 		pos_hare[1] = frame_y + DIF_MASK_HARE;
 		pos_hare[2] = hare_x;
@@ -2568,7 +2568,7 @@ void DrasculaEngine::pon_hare() {
 	}
 }
 
-void DrasculaEngine::menu_sin_volcar() {
+void DrasculaEngine::showMenu() {
 	int h, n, x;
 	char texto_icono[13];
 
@@ -2639,7 +2639,7 @@ bool DrasculaEngine::exitRoom(int l) {
 				sentido_hare = sentidobj[l];
 				updateRoom();
 				updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
-				hare_se_mueve = 0;
+				characterMoved = 0;
 				sentido_hare = sentido_alkeva[l];
 				objExit = alapuertakeva[l];
 				doBreak = 1;
@@ -2660,7 +2660,7 @@ bool DrasculaEngine::exitRoom(int l) {
 		updateDoor(l);
 		if (isDoor[l] != 0) {
 			lleva_al_hare(sitiobj_x[l], sitiobj_y[l]);
-			hare_se_mueve = 0;
+			characterMoved = 0;
 			sentido_hare = sentido_alkeva[l];
 			objExit = alapuertakeva[l];
 			doBreak = 1;
@@ -2696,7 +2696,7 @@ bool DrasculaEngine::exitRoom(int l) {
 			sentido_hare = sentidobj[l];
 			updateRoom();
 			updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
-			hare_se_mueve = 0;
+			characterMoved = 0;
 			sentido_hare = sentido_alkeva[l];
 			objExit = alapuertakeva[l];
 			doBreak = 1;
@@ -2714,7 +2714,7 @@ bool DrasculaEngine::exitRoom(int l) {
 			sentido_hare = sentidobj[l];
 			updateRoom();
 			updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
-			hare_se_mueve = 0;
+			characterMoved = 0;
 			sentido_hare = sentido_alkeva[l];
 			objExit = alapuertakeva[l];
 			doBreak = 1;
@@ -2735,7 +2735,7 @@ bool DrasculaEngine::exitRoom(int l) {
 			sentido_hare = sentidobj[l];
 			updateRoom();
 			updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
-			hare_se_mueve = 0;
+			characterMoved = 0;
 			sentido_hare = sentido_alkeva[l];
 			objExit = alapuertakeva[l];
 			doBreak = 1;
@@ -2754,7 +2754,7 @@ bool DrasculaEngine::exitRoom(int l) {
 			sentido_hare = sentidobj[l];
 			updateRoom();
 			updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
-			hare_se_mueve = 0;
+			characterMoved = 0;
 			sentido_hare = sentido_alkeva[l];
 			objExit = alapuertakeva[l];
 			doBreak = 1;
@@ -2779,7 +2779,7 @@ bool DrasculaEngine::pickupObject() {
 	checkFlags = 1;
 
 	updateRoom();
-	menu_sin_volcar();
+	showMenu();
 	updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
 
 	// Objects with an ID smaller than 7 are the inventory verbs
@@ -2805,7 +2805,7 @@ bool DrasculaEngine::pickupObject() {
 }
 
 bool DrasculaEngine::checkFlag(int fl) {
-	hare_se_mueve = 0;
+	characterMoved = 0;
 	updateRoom();
 	updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
 
@@ -3494,15 +3494,15 @@ void DrasculaEngine::WaitForNext(int FPS) {
 	_system->delayMillis(1000 / FPS);
 }
 
-int DrasculaEngine::vez() {
+int DrasculaEngine::getTime() {
 	return _system->getMillis() / 20; // originaly was 1
 }
 
 void DrasculaEngine::reduce_hare_chico(int xx1, int yy1, int xx2, int yy2, int width, int height, int factor, byte *dir_inicio, byte *dir_fin) {
 	float totalX, totalY;
 	int n, m;
-	float pixel_x, pixel_y;
-	int pos_pixel[6];
+	float pixelX, pixelY;
+	int pixelPos[6];
 
 	newWidth = (width * factor) / 100;
 	newHeight = (height * factor) / 100;
@@ -3510,31 +3510,27 @@ void DrasculaEngine::reduce_hare_chico(int xx1, int yy1, int xx2, int yy2, int w
 	totalX = width / newWidth;
 	totalY = height / newHeight;
 
-	pixel_x = xx1;
-	pixel_y = yy1;
+	pixelX = xx1;
+	pixelY = yy1;
 
 	for (n = 0; n < newHeight; n++) {
 		for (m = 0; m < newWidth; m++) {
-			pos_pixel[0] = (int)pixel_x;
-			pos_pixel[1] = (int)pixel_y;
-			pos_pixel[2] = xx2 + m;
-			pos_pixel[3] = yy2 + n;
-			pos_pixel[4] = 1;
-			pos_pixel[5] = 1;
+			pixelPos[0] = (int)pixelX;
+			pixelPos[1] = (int)pixelY;
+			pixelPos[2] = xx2 + m;
+			pixelPos[3] = yy2 + n;
+			pixelPos[4] = 1;
+			pixelPos[5] = 1;
 
-			copyRectClip(pos_pixel, dir_inicio, dir_fin);
+			copyRectClip(pixelPos, dir_inicio, dir_fin);
 
-			pixel_x = pixel_x + totalX;
+			pixelX = pixelX + totalX;
 		}
-		pixel_x = xx1;
-		pixel_y = pixel_y + totalY;
+		pixelX = xx1;
+		pixelY = pixelY + totalY;
 	}
 }
 
-char DrasculaEngine::codifica(char car) {
-	return ~car;
-}
-
 void DrasculaEngine::quadrant_1() {
 	float distance_x, distance_y;
 
@@ -3651,10 +3647,10 @@ void DrasculaEngine::saveGame(char gameName[]) {
 }
 
 void DrasculaEngine::increaseFrameNum() {
-	diff_vez = vez() - conta_vez;
+	diff_vez = getTime() - conta_vez;
 
 	if (diff_vez >= 6) {
-		conta_vez = vez();
+		conta_vez = getTime();
 		num_frame++;
 		if (num_frame == 6)
 			num_frame = 0;
@@ -4463,7 +4459,7 @@ void DrasculaEngine::activatePendulum() {
 
 	copyBackground(0, 171, 0, 0, OBJWIDTH, OBJHEIGHT, backSurface, drawSurface3);
 
-	conta_blind_vez = vez();
+	conta_blind_vez = getTime();
 }
 
 void DrasculaEngine::closeDoor(int nflag, int doorNum) {
diff --git a/engines/drascula/drascula.h b/engines/drascula/drascula.h
index e89fdf1123..6db70333bc 100644
--- a/engines/drascula/drascula.h
+++ b/engines/drascula/drascula.h
@@ -311,7 +311,7 @@ public:
 	int flags[NUM_FLAGS];
 
 	int frame_y;
-	int hare_x, hare_y, hare_se_mueve, direccion_hare, sentido_hare, num_frame, hare_se_ve;
+	int hare_x, hare_y, characterMoved, direccion_hare, sentido_hare, num_frame, hare_se_ve;
 	int sitio_x, sitio_y, checkFlags;
 	int doBreak;
 	int stepX, stepY;
@@ -523,7 +523,7 @@ public:
 	void updateRefresh();
 	void updateRefresh_pre();
 	void pon_hare();
-	void menu_sin_volcar();
+	void showMenu();
 	void clearMenu();
 	void removeObject();
 	bool exitRoom(int);
@@ -564,9 +564,8 @@ public:
 	byte *loadPCX(byte *NamePcc);
 	void set_dac(byte *dac);
 	void WaitForNext(int FPS);
-	int vez();
+	int getTime();
 	void reduce_hare_chico(int, int, int, int, int, int, int, byte *, byte *);
-	char codifica(char);
 	void quadrant_1();
 	void quadrant_2();
 	void quadrant_3();
diff --git a/engines/drascula/rooms.cpp b/engines/drascula/rooms.cpp
index 0fdd0ed4e9..c569efd065 100644
--- a/engines/drascula/rooms.cpp
+++ b/engines/drascula/rooms.cpp
@@ -1469,7 +1469,7 @@ void DrasculaEngine::update_1_pre() {
 
 void DrasculaEngine::update_2(){
 	int pos_murci[6];
-	int diferencia;
+	int difference;
 	int murci_x[] = {0, 38, 76, 114, 152, 190, 228, 266,
 					0, 38, 76, 114, 152, 190, 228, 266,
 					0, 38, 76, 114, 152, 190,
@@ -1507,10 +1507,10 @@ void DrasculaEngine::update_2(){
 	pos_murci[3] = 19;
 
 	copyRectClip(pos_murci, drawSurface3, screenSurface);
-	diferencia = vez() - conta_blind_vez;
-	if (diferencia >= 6) {
+	difference = getTime() - conta_blind_vez;
+	if (difference >= 6) {
 		frame_bat++;
-		conta_blind_vez = vez();
+		conta_blind_vez = getTime();
 	}
 
 	copyRect(29, 37, 58, 114, 57, 39, drawSurface3, screenSurface);
@@ -1580,14 +1580,14 @@ void DrasculaEngine::update_7_pre() {
 void DrasculaEngine::update_9_pre() {
 	int blind_x[] = {26, 68, 110, 152, 194, 236, 278, 26, 68};
 	int blind_y[] = {51, 51, 51, 51, 51, 51, 51, 127, 127};
-	int diferencia;
+	int difference;
 
 	copyRect(blind_x[frame_blind], blind_y[frame_blind], 122, 57, 41, 72, drawSurface3, screenSurface);
 	if (flags[9] == 0) {
-		diferencia = vez() - conta_blind_vez;
-		if (diferencia >= 11) {
+		difference = getTime() - conta_blind_vez;
+		if (difference >= 11) {
 			frame_blind++;
-			conta_blind_vez = vez();
+			conta_blind_vez = getTime();
 		}
 		if (frame_blind == 9)
 			frame_blind = 0;
@@ -1615,7 +1615,7 @@ void DrasculaEngine::update_14_pre() {
 	int cirio_x[] = {14, 19, 24};
 	int pianista_x[] = {1, 91, 61, 31, 91, 31, 1, 61, 31};
 	int drunk_x[] = {1, 42, 83, 124, 165, 206, 247, 1};
-	int diferencia;
+	int difference;
 
 	copyBackground(123, velas_y[frame_velas], 142, 14, 39, 13, drawSurface3, screenSurface);
 	copyBackground(cirio_x[frame_velas], 146, 311, 80, 4, 8, drawSurface3, screenSurface);
@@ -1633,8 +1633,8 @@ void DrasculaEngine::update_14_pre() {
 
 	if (flags[12] == 1)
 		copyBackground(drunk_x[frame_drunk], 82, 170, 50, 40, 53, drawSurface3, screenSurface);
-	diferencia = vez() - conta_blind_vez;
-	if (diferencia > 6) {
+	difference = getTime() - conta_blind_vez;
+	if (difference > 6) {
 		if (flags[12] == 1) {
 			frame_drunk++;
 			if (frame_drunk == 8) {
@@ -1651,7 +1651,7 @@ void DrasculaEngine::update_14_pre() {
 		if (frame_piano == 9)
 			frame_piano = 0;
 		blinking = _rnd->getRandomNumber(10);
-		conta_blind_vez = vez();
+		conta_blind_vez = getTime();
 	}
 }
 
@@ -1676,7 +1676,7 @@ void DrasculaEngine::update_17() {
 }
 
 void DrasculaEngine::update_18_pre() {
-	int diferencia;
+	int difference;
 	int snore_x[] = {95, 136, 95, 136, 95, 95, 95, 95, 136, 95, 95, 95, 95, 95, 95, 95};
 	int snore_y[] = {18, 18, 56, 56, 94, 94, 94, 94, 94, 18, 18, 18, 18, 18, 18, 18};
 
@@ -1686,12 +1686,12 @@ void DrasculaEngine::update_18_pre() {
 	} else
 		pon_vb();
 
-	diferencia = vez() - conta_blind_vez;
-	if (diferencia > 9) {
+	difference = getTime() - conta_blind_vez;
+	if (difference > 9) {
 		frame_snore++;
 		if (frame_snore == 16)
 			frame_snore = 0;
-		conta_blind_vez = vez();
+		conta_blind_vez = getTime();
 	}
 }
 
@@ -1746,7 +1746,7 @@ void DrasculaEngine::update_24_pre() {
 }
 
 void DrasculaEngine::update_26_pre() {
-	int diferencia;
+	int difference;
 
 	if (flags[2] == 1)
 		copyBackground(1, 130, 87, 44, 50, 69, drawSurface3, screenSurface);
@@ -1760,10 +1760,10 @@ void DrasculaEngine::update_26_pre() {
 	if (blinking == 5 && flags[18] == 0)
 		copyBackground(52, 172, 226, 106, 3, 4, drawSurface3, screenSurface);
 
-	diferencia = vez() - conta_blind_vez;
-	if (diferencia >= 10) {
+	difference = getTime() - conta_blind_vez;
+	if (difference >= 10) {
 		blinking = _rnd->getRandomNumber(10);
-		conta_blind_vez = vez();
+		conta_blind_vez = getTime();
 	}
 
 	if (flags[20] == 1)
@@ -1916,7 +1916,7 @@ void DrasculaEngine::update_59_pre() {
 
 void DrasculaEngine::update_60_pre() {
 	int velas_y[] = {158, 172, 186};
-	int diferencia;
+	int difference;
 
 	if (flags[5] == 0)
 		placeDrascula();
@@ -1926,17 +1926,17 @@ void DrasculaEngine::update_60_pre() {
 	if (flag_tv == 1)
 		copyBackground(114, 158, 8, 30, 8, 23, drawSurface3, screenSurface);
 
-	diferencia = vez() - conta_blind_vez;
+	difference = getTime() - conta_blind_vez;
 	blinking = _rnd->getRandomNumber(7);
 	if (blinking == 5 && flag_tv == 0)
 		flag_tv = 1;
 	else if (blinking == 5 && flag_tv == 1)
 		flag_tv = 0;
-	if (diferencia > 6) {
+	if (difference > 6) {
 		frame_velas++;
 		if (frame_velas == 3)
 			frame_velas = 0;
-		conta_blind_vez = vez();
+		conta_blind_vez = getTime();
 	}
 }
 
@@ -1954,7 +1954,7 @@ void DrasculaEngine::update_62_pre() {
 	int cirio_x[] = { 14, 19, 24 };
 	int pianista_x[] = {1, 91, 61, 31, 91, 31, 1, 61, 31 };
 	int drunk_x[] = {1, 42, 83, 124, 165, 206, 247, 1 };
-	int diferencia;
+	int difference;
 
 	copyBackground(123, velas_y[frame_velas], 142, 14, 39, 13, drawSurface3, screenSurface);
 	copyBackground(cirio_x[frame_velas], 146, 311, 80, 4, 8, drawSurface3, screenSurface);
@@ -1975,8 +1975,8 @@ void DrasculaEngine::update_62_pre() {
 	if (flags[12] == 1)
 		copyBackground(drunk_x[frame_drunk], 82, 170, 50, 40, 53, drawSurface3, screenSurface);
 
-	diferencia = vez() - conta_blind_vez;
-	if (diferencia > 6) {
+	difference = getTime() - conta_blind_vez;
+	if (difference > 6) {
 		if (flags[12] == 1) {
 			frame_drunk++;
 			if (frame_drunk == 8) {
@@ -1993,7 +1993,7 @@ void DrasculaEngine::update_62_pre() {
 		if (frame_piano == 9)
 			frame_piano = 0;
 		blinking = _rnd->getRandomNumber(10);
-		conta_blind_vez = vez();
+		conta_blind_vez = getTime();
 	}
 }
 
@@ -2014,7 +2014,7 @@ void DrasculaEngine::update_63() {
 
 void DrasculaEngine::update_pendulum() {
 	int pendulum_x[] = {40, 96, 152, 208, 264, 40, 96, 152, 208, 208, 152, 264, 40, 96, 152, 208, 264};
-	int diferencia;
+	int difference;
 
 	if (frame_pen <= 4)
 		pendulumSurface = drawSurface3;
@@ -2031,12 +2031,12 @@ void DrasculaEngine::update_pendulum() {
 	if (flags[1] == 0)
 		copyRect(44, 145, 145, 105, 25, 29, drawSurface3, screenSurface);
 
-	diferencia = vez() - conta_blind_vez;
-	if (diferencia > 8) {
+	difference = getTime() - conta_blind_vez;
+	if (difference > 8) {
 		frame_pen++;
 		if (frame_pen == 17)
 			frame_pen = 0;
-		conta_blind_vez = vez();
+		conta_blind_vez = getTime();
 	}
 }