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

thebluegr at users.sourceforge.net thebluegr at users.sourceforge.net
Fri May 30 09:19:10 CEST 2008


Revision: 32376
          http://scummvm.svn.sourceforge.net/scummvm/?rev=32376&view=rev
Author:   thebluegr
Date:     2008-05-30 00:19:09 -0700 (Fri, 30 May 2008)

Log Message:
-----------
rompo -> doBreak
Removed unused variable rompo2

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

Modified: scummvm/trunk/engines/drascula/animation.cpp
===================================================================
--- scummvm/trunk/engines/drascula/animation.cpp	2008-05-30 07:16:17 UTC (rev 32375)
+++ scummvm/trunk/engines/drascula/animation.cpp	2008-05-30 07:19:09 UTC (rev 32376)
@@ -2163,7 +2163,7 @@
 	lleva_al_hare(40, 169);
 	lleva_al_hare(-14, 175);
 
-	rompo = 1;
+	doBreak = 1;
 	previousMusic = roomMusic;
 	hare_se_ve = 1;
 	clearRoom();
@@ -2389,7 +2389,7 @@
 	decompressPic(extraSurface, 1);
 	loadPic("99.alg");
 	decompressPic(backSurface, 1);
-	rompo = 1;
+	doBreak = 1;
 	objExit = 104;
 	hare_x = -1;
 	withoutVerb();

Modified: scummvm/trunk/engines/drascula/drascula.cpp
===================================================================
--- scummvm/trunk/engines/drascula/drascula.cpp	2008-05-30 07:16:17 UTC (rev 32375)
+++ scummvm/trunk/engines/drascula/drascula.cpp	2008-05-30 07:19:09 UTC (rev 32376)
@@ -167,7 +167,7 @@
 		frame_y = 0;
 		hare_x = -1; hare_se_mueve = 0; sentido_hare = 3; num_frame = 0; hare_se_ve = 1;
 		checkFlags = 1;
-		rompo = 0; rompo2 = 0;
+		doBreak = 0;
 		walkToObject = 0;
 		stepX = PASO_HARE_X; stepY = PASO_HARE_Y;
 		alto_hare = CHARACTER_HEIGHT; ancho_hare = CHARACTER_WIDTH; feetHeight = PIES_HARE;
@@ -1291,31 +1291,31 @@
 	else {
 		for (l = 0; l < numRoomObjs; l++) {
 			if (mouseX >= x1[l] && mouseY >= y1[l]
-					&& mouseX <= x2[l] && mouseY <= y2[l] && rompo == 0) {
+					&& mouseX <= x2[l] && mouseY <= y2[l] && doBreak == 0) {
 				if (exitRoom(l))
 					return true;
-				if (rompo == 1)
+				if (doBreak == 1)
 					break;
 			}
 		}
 
 		if (mouseX > hare_x && mouseY > hare_y
 				&& mouseX < hare_x + ancho_hare && mouseY < hare_y + alto_hare)
-			rompo = 1;
+			doBreak = 1;
 
 		for (l = 0; l < numRoomObjs; l++) {
 			if (mouseX > x1[l] && mouseY > y1[l]
-					&& mouseX < x2[l] && mouseY < y2[l] && rompo == 0) {
+					&& mouseX < x2[l] && mouseY < y2[l] && doBreak == 0) {
 				sitio_x = sitiobj_x[l];
 				sitio_y = sitiobj_y[l];
 				sentido_final = sentidobj[l];
-				rompo = 1;
+				doBreak = 1;
 				walkToObject = 1;
 				startWalking();
 			}
 		}
 
-		if (rompo == 0) {
+		if (doBreak == 0) {
 			sitio_x = mouseX;
 			sitio_y = mouseY;
 
@@ -1330,7 +1330,7 @@
 
 			startWalking();
 		}
-		rompo = 0;
+		doBreak = 0;
 	}
 
 	return false;
@@ -2643,7 +2643,7 @@
 				hare_se_mueve = 0;
 				sentido_hare = sentido_alkeva[l];
 				objExit = alapuertakeva[l];
-				rompo = 1;
+				doBreak = 1;
 				previousMusic = roomMusic;
 
 				if (objectNum[l] == 105) {
@@ -2664,7 +2664,7 @@
 			hare_se_mueve = 0;
 			sentido_hare = sentido_alkeva[l];
 			objExit = alapuertakeva[l];
-			rompo = 1;
+			doBreak = 1;
 			previousMusic = roomMusic;
 			if (objectNum[l] == 136)
 				animation_2_2();
@@ -2700,7 +2700,7 @@
 			hare_se_mueve = 0;
 			sentido_hare = sentido_alkeva[l];
 			objExit = alapuertakeva[l];
-			rompo = 1;
+			doBreak = 1;
 			previousMusic = roomMusic;
 			clearRoom();
 			strcpy(salgo, targetScreen[l]);
@@ -2718,7 +2718,7 @@
 			hare_se_mueve = 0;
 			sentido_hare = sentido_alkeva[l];
 			objExit = alapuertakeva[l];
-			rompo = 1;
+			doBreak = 1;
 			previousMusic = roomMusic;
 
 			if (objectNum[l] == 108)
@@ -2739,7 +2739,7 @@
 			hare_se_mueve = 0;
 			sentido_hare = sentido_alkeva[l];
 			objExit = alapuertakeva[l];
-			rompo = 1;
+			doBreak = 1;
 			previousMusic = roomMusic;
 			hare_se_ve = 1;
 			clearRoom();
@@ -2758,7 +2758,7 @@
 			hare_se_mueve = 0;
 			sentido_hare = sentido_alkeva[l];
 			objExit = alapuertakeva[l];
-			rompo = 1;
+			doBreak = 1;
 			previousMusic = roomMusic;
 			clearRoom();
 			strcpy(salgo, targetScreen[l]);

Modified: scummvm/trunk/engines/drascula/drascula.h
===================================================================
--- scummvm/trunk/engines/drascula/drascula.h	2008-05-30 07:16:17 UTC (rev 32375)
+++ scummvm/trunk/engines/drascula/drascula.h	2008-05-30 07:19:09 UTC (rev 32376)
@@ -313,7 +313,7 @@
 	int frame_y;
 	int hare_x, hare_y, hare_se_mueve, direccion_hare, sentido_hare, num_frame, hare_se_ve;
 	int sitio_x, sitio_y, checkFlags;
-	int rompo, rompo2;
+	int doBreak;
 	int stepX, stepY;
 	int alto_hare, ancho_hare, feetHeight;
 	int alto_talk, ancho_talk;


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




More information about the Scummvm-git-logs mailing list