CRUISE: Reduce the scope of several variables in processActorWalk()

scummvm · Jun 6, 2014 · ec0d6b9 · ec0d6b9
1 parent b830b84
commit ec0d6b9
Showing 1 changed file with 6 additions and 9 deletions.
diff --git a/engines/cruise/perso.cpp b/engines/cruise/perso.cpp
@@ -172,23 +172,20 @@ void processActorWalk(MovementEntry &resx_y, int16 *inc_droite, int16 *inc_droit
                       int16 *inc_chemin, point* cor_joueur,
                       int16 solution0[NUM_NODES + 3][2], int16 *inc_jo1, int16 *inc_jo2,
                       int16 *dir_perso, int16 *inc_jo0, int16 num) {
-	int x1, x2, y1, y2;
-	int i, u;
-
-	u = 0;
+	int u = 0;
 	inc_jo = *inc_jo0;
 
-	i = *inc_chemin;
+	int i = *inc_chemin;
 
 	if (!*inc_droite) {
-		x1 = solution0[i][0];
-		y1 = solution0[i][1];
+		int x1 = solution0[i][0];
+		int y1 = solution0[i][1];
 		i++;
 		if (solution0[i][0] != -1) {
 			do {
 				if (solution0[i][0] != -2) {
-					x2 = solution0[i][0];
-					y2 = solution0[i][1];
+					int x2 = solution0[i][0];
+					int y2 = solution0[i][1];
 					if ((x1 == x2) && (y1 == y2)) {
 						resx_y.x = -1;
 						resx_y.y = -1;