[Scummvm-cvs-logs] SF.net SVN: scummvm: [32363] scummvm/trunk/engines/drascula

[thebluegr at users.sourceforge.net]

Revision: 32363
          http://scummvm.svn.sourceforge.net/scummvm/?rev=32363&view=rev
Author:   thebluegr
Date:     2008-05-29 07:14:31 -0700 (Thu, 29 May 2008)

Log Message:
-----------
MirarRaton -> updateEvents
espera_soltar -> updateEvents
Some cleanup

Modified Paths:
--------------
    scummvm/trunk/engines/drascula/drascula.cpp
    scummvm/trunk/engines/drascula/drascula.h

Modified: scummvm/trunk/engines/drascula/drascula.cpp
===================================================================
--- scummvm/trunk/engines/drascula/drascula.cpp	2008-05-29 14:04:47 UTC (rev 32362)
+++ scummvm/trunk/engines/drascula/drascula.cpp	2008-05-29 14:14:31 UTC (rev 32363)
@@ -664,7 +664,7 @@
 			playMusic(roomMusic);
 	}
 
-	MirarRaton();
+	updateEvents();
 
 	if (menu_scr == 0 && lleva_objeto == 1)
 		comprueba_objetos();
@@ -678,7 +678,7 @@
 		decompressPic(dir_hare_fondo, 1);
 		setPalette((byte *)&gamePalette);
 		menu_scr = 0;
-		espera_soltar();
+		updateEvents();
 		if (num_ejec != 3)
 			cont_sv = 0;
 	}
@@ -697,7 +697,7 @@
 			loadPic("icons.alg");
 		decompressPic(dir_hare_fondo, 1);
 		menu_scr = 1;
-		espera_soltar();
+		updateEvents();
 		withoutVerb();
 		if (num_ejec != 3)
 			cont_sv = 0;
@@ -1270,14 +1270,6 @@
 		hay_nombre = 0;
 }
 
-void DrasculaEngine::espera_soltar() {
-	updateEvents();
-}
-
-void DrasculaEngine::MirarRaton() {
-	updateEvents();
-}
-
 void DrasculaEngine::elige_en_barra() {
 	int n, num_verbo = -1;
 
@@ -1462,7 +1454,7 @@
 
 		updateScreen(0, 0, 0, 0, 320, 200, dir_zona_pantalla);
 
-		MirarRaton();
+		updateEvents();
 
 		if (button_dch == 1) {
 			delay(100);
@@ -1500,7 +1492,7 @@
 
 	}
 
-	espera_soltar();
+	updateEvents();
 }
 
 bool DrasculaEngine::saves() {
@@ -1546,7 +1538,7 @@
 		updateScreen(0, 0, 0, 0, 320, 200, dir_zona_pantalla);
 		y = 27;
 
-		MirarRaton();
+		updateEvents();
 
 		if (button_izq == 1) {
 			delay(100);
@@ -1818,7 +1810,7 @@
 	file.read(ghost, 65536);
 	file.close();
 
-	MirarRaton();
+	updateEvents();
 	xr = mouseX;
 	yr = mouseY;
 
@@ -1895,7 +1887,7 @@
 
 		// end of efecto()
 
-		MirarRaton();
+		updateEvents();
 		if (button_dch == 1 || button_izq == 1)
 			break;
 		if (mouseX != xr)
@@ -2653,7 +2645,7 @@
 		}
 	}
 
-	espera_soltar();
+	updateEvents();
 
 	if (lleva_objeto == 1)
 		chooseObject(h);
@@ -2832,7 +2824,7 @@
 		if (comprueba_banderas_menu())
 			return true;
 	}
-	espera_soltar();
+	updateEvents();
 	if (lleva_objeto == 0)
 		withoutVerb();
 
@@ -3866,7 +3858,7 @@
 			playMusic(roomMusic);
 	}
 
-	MirarRaton();
+	updateEvents();
 
 	if (mouseY > 0 && mouseY < 9) {
 		if (used1 == 1 && _color != WHITE)
@@ -3937,19 +3929,9 @@
 		color_abc(LIGHT_GREEN);
 	}
 
-	if (used1 == 0)
-		game1 = 1;
-	else
-		game1 = 3;
-	if (used2 == 0)
-		game2 = 1;
-	else
-		game2 = 3;
-	if (used3 == 0)
-		game3 = 1;
-	else
-		game3 = 3;
-
+	game1 = (used1 == 0) ? 1 : 3;
+	game2 = (used2 == 0) ? 1 : 3;
+	game3 = (used3 == 0) ? 1 : 3;
 	game4 = 1;
 
 	if (rompo_y_salgo == 0)

Modified: scummvm/trunk/engines/drascula/drascula.h
===================================================================
--- scummvm/trunk/engines/drascula/drascula.h	2008-05-29 14:04:47 UTC (rev 32362)
+++ scummvm/trunk/engines/drascula/drascula.h	2008-05-29 14:14:31 UTC (rev 32363)
@@ -455,8 +455,6 @@
 	void lleva_al_hare(int, int);
 	void mueve_cursor();
 	void comprueba_objetos();
-	void espera_soltar();
-	void MirarRaton();
 	void elige_en_barra();
 	bool comprueba1();
 	bool comprueba2();


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.