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

[fingolfin at users.sourceforge.net]

Revision: 32403
          http://scummvm.svn.sourceforge.net/scummvm/?rev=32403&view=rev
Author:   fingolfin
Date:     2008-05-30 09:39:49 -0700 (Fri, 30 May 2008)

Log Message:
-----------
Fix warnings

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 15:15:49 UTC (rev 32402)
+++ scummvm/trunk/engines/drascula/animation.cpp	2008-05-30 16:39:49 UTC (rev 32403)
@@ -27,7 +27,7 @@
 
 namespace Drascula {
 
-void DrasculaEngine::updateAnim(int y, int destX, int destY, int width, int height, int count, byte* src, int delay) {
+void DrasculaEngine::updateAnim(int y, int destX, int destY, int width, int height, int count, byte* src, int delayVal) {
 	int x = 0;
 
 	for (int n = 0; n < count; n++){
@@ -35,7 +35,7 @@
 		copyBackground(x, y, destX, destY, width, height, src, screenSurface);
 		updateScreen(destX, destY, destX, destY, width, height, screenSurface);
 		x += width;
-		pause(delay);
+		pause(delayVal);
 	}
 }
 

Modified: scummvm/trunk/engines/drascula/drascula.cpp
===================================================================
--- scummvm/trunk/engines/drascula/drascula.cpp	2008-05-30 15:15:49 UTC (rev 32402)
+++ scummvm/trunk/engines/drascula/drascula.cpp	2008-05-30 16:39:49 UTC (rev 32403)
@@ -956,11 +956,11 @@
 		sscanf(buffer, "%d", &isDoor[l]);
 		if (isDoor[l] != 0) {
 			getLine(ald, buffer, size);
-			sscanf(buffer, "%s", targetSurface[l]);
+			sscanf(buffer, "%s", _targetSurface[l]);
 			getLine(ald, buffer, size);
-			sscanf(buffer, "%d", &destX[l]);
+			sscanf(buffer, "%d", &_destX[l]);
 			getLine(ald, buffer, size);
-			sscanf(buffer, "%d", &destY[l]);
+			sscanf(buffer, "%d", &_destY[l]);
 			getLine(ald, buffer, size);
 			sscanf(buffer, "%d", &sentido_alkeva[l]);
 			getLine(ald, buffer, size);
@@ -1009,8 +1009,8 @@
 
 	if (num_ejec == 2) {
 		if (hare_x == -1) {
-			hare_x = destX[obj_salir];
-			hare_y = destY[obj_salir] - alto_hare;
+			hare_x = _destX[obj_salir];
+			hare_y = _destY[obj_salir] - alto_hare;
 		}
 		characterMoved = 0;
 	}
@@ -1065,8 +1065,8 @@
 
 	if (num_ejec != 2) {
 		if (hare_x == -1) {
-			hare_x = destX[obj_salir];
-			hare_y = destY[obj_salir];
+			hare_x = _destX[obj_salir];
+			hare_y = _destY[obj_salir];
 			alto_hare = (CHARACTER_HEIGHT * factor_red[hare_y]) / 100;
 			ancho_hare = (CHARACTER_WIDTH * factor_red[hare_y]) / 100;
 			hare_y = hare_y - alto_hare;
@@ -2599,7 +2599,7 @@
 					return true;
 				}
 				clearRoom();
-				strcpy(salgo, targetSurface[l]);
+				strcpy(salgo, _targetSurface[l]);
 				strcat(salgo, ".ald");
 				hare_x = -1;
 				carga_escoba(salgo);
@@ -2633,7 +2633,7 @@
 			clearRoom();
 			delete ald;
 			ald = NULL;
-			strcpy(salgo, targetSurface[l]);
+			strcpy(salgo, _targetSurface[l]);
 			strcat(salgo, ".ald");
 			hare_x =- 1;
 			carga_escoba(salgo);
@@ -2651,7 +2651,7 @@
 			doBreak = 1;
 			previousMusic = roomMusic;
 			clearRoom();
-			strcpy(salgo, targetSurface[l]);
+			strcpy(salgo, _targetSurface[l]);
 			strcat(salgo, ".ald");
 			hare_x =- 1;
 			carga_escoba(salgo);
@@ -2672,7 +2672,7 @@
 			if (objectNum[l] == 108)
 				lleva_al_hare(171, 78);
 			clearRoom();
-			strcpy(salgo, targetSurface[l]);
+			strcpy(salgo, _targetSurface[l]);
 			strcat(salgo, ".ald");
 			hare_x = -1;
 			carga_escoba(salgo);
@@ -2691,7 +2691,7 @@
 			previousMusic = roomMusic;
 			hare_se_ve = 1;
 			clearRoom();
-			strcpy(salgo, targetSurface[l]);
+			strcpy(salgo, _targetSurface[l]);
 			strcat(salgo, ".ald");
 			hare_x = -1;
 			carga_escoba(salgo);
@@ -2709,7 +2709,7 @@
 			doBreak = 1;
 			previousMusic = roomMusic;
 			clearRoom();
-			strcpy(salgo, targetSurface[l]);
+			strcpy(salgo, _targetSurface[l]);
 			strcat(salgo, ".ald");
 			hare_x = -1;
 			carga_escoba(salgo);

Modified: scummvm/trunk/engines/drascula/drascula.h
===================================================================
--- scummvm/trunk/engines/drascula/drascula.h	2008-05-30 15:15:49 UTC (rev 32402)
+++ scummvm/trunk/engines/drascula/drascula.h	2008-05-30 16:39:49 UTC (rev 32403)
@@ -295,8 +295,8 @@
 	int objectNum[40], visible[40], isDoor[40];
 	int sitiobj_x[40], sitiobj_y[40], sentidobj[40];
 	int inventoryObjects[43];
-	char targetSurface[40][20];
-	int destX[40], destY[40], sentido_alkeva[40], alapuertakeva[40];
+	char _targetSurface[40][20];
+	int _destX[40], _destY[40], sentido_alkeva[40], alapuertakeva[40];
 	int x1[40], y1[40], x2[40], y2[40];
 	int takeObject, pickedObject;
 	int withVoices;
@@ -647,7 +647,7 @@
 	bool room_13(int fl);
 	void update_13();
 	void update_20();
-	void updateAnim(int y, int destX, int destY, int width, int height, int count, byte* src, int delay = 3);
+	void updateAnim(int y, int destX, int destY, int width, int height, int count, byte* src, int delayVal = 3);
 	void updateAnim2(int y, int px, int py, int width, int height, int count, byte* src);
 	void animation_1_3();
 	void animation_2_3();


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