[Scummvm-cvs-logs] CVS: scummvm/sky autoroute.cpp,1.13,1.14

Robert G?ffringmann lavosspawn at users.sourceforge.net
Wed Jul 16 17:36:12 CEST 2003


Update of /cvsroot/scummvm/scummvm/sky
In directory sc8-pr-cvs1:/tmp/cvs-serv22635/sky

Modified Files:
	autoroute.cpp 
Log Message:
fix additional array read

Index: autoroute.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/autoroute.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- autoroute.cpp	13 Jul 2003 16:22:16 -0000	1.13
+++ autoroute.cpp	17 Jul 2003 00:35:32 -0000	1.14
@@ -106,12 +106,6 @@
 		// next_stretch:
 		routeCalc--;
 		bitsLeft--;
-		if (!bitsLeft) {
-			gridData = screenGrid[0] | (screenGrid[1] << 8) |
-				(screenGrid[2] << 16) | (screenGrid[3] << 24);
-			screenGrid -= 4;
-			bitsLeft = 32;
-		}
 		// still bits:
 		gridCntX--;
 		if (gridCntX == 0) {
@@ -121,6 +115,12 @@
 			gridCntX = ROUTE_GRID_WIDTH - 2;
 			stretch1 = 0; // clear stretch factor
 			gridCntY--;
+		}
+		if (gridCntY && (!bitsLeft)) {
+			gridData = screenGrid[0] | (screenGrid[1] << 8) |
+				(screenGrid[2] << 16) | (screenGrid[3] << 24);
+			screenGrid -= 4;
+			bitsLeft = 32;
 		}
 	} while(gridCntY);
 	for (cnt = 0; cnt < ROUTE_GRID_WIDTH - 1; cnt++) 





More information about the Scummvm-git-logs mailing list