[Scummvm-cvs-logs] CVS: scummvm/sky autoroute.cpp,1.3,1.4 autoroute.h,1.3,1.4

[Oliver Kiehl]

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

Modified Files:
	autoroute.cpp autoroute.h 
Log Message:
fix mistake I did earlier


Index: autoroute.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/autoroute.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- autoroute.cpp	27 Apr 2003 15:49:08 -0000	1.3
+++ autoroute.cpp	27 Apr 2003 16:36:24 -0000	1.4
@@ -52,14 +52,14 @@
 	return retVal;
 }
 
-uint16 SkyAutoRoute::autoRoute(Compact *cpt, uint16 *routeCalc) {
+uint16 SkyAutoRoute::autoRoute(Compact *cpt, uint16 **pSaveRoute) {
 
 	if (!cpt->extCompact)
 		error("SkyAutoRoute::autoRoute: fatal error. cpt->extCompact == NULL!\n");
 	uint16* routeData = (uint16*)cpt->extCompact->animScratch;
 	uint8* screenGrid = _grid->giveGrid(cpt->screen) - 4;
 	// ^^ this is actually a pointer to the last dword of the grid
-	routeCalc = _routeGrid + (ROUTE_GRID_SIZE >> 1) - 1;	
+	uint16 *routeCalc = _routeGrid + (ROUTE_GRID_SIZE >> 1) - 1;	
 	
 	uint8 stretch1, stretch2; // bl / bh
 	stretch1 = 0;
@@ -342,6 +342,7 @@
 	// I wonder why initY isn't checked
     // saveRoute should now point to routeData
 	if (routeData > saveRoute) error("Autoroute: Internal pointer error! routeData overflow.");
+	*pSaveRoute = saveRoute;
 	return 1;
 }
 

Index: autoroute.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/autoroute.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- autoroute.h	27 Apr 2003 15:43:08 -0000	1.3
+++ autoroute.h	27 Apr 2003 16:36:24 -0000	1.4
@@ -36,7 +36,7 @@
 public:
 	SkyAutoRoute(SkyGrid *pGrid);
 	~SkyAutoRoute(void);
-	uint16 autoRoute(Compact *cpt, uint16 *routeCalc);
+	uint16 autoRoute(Compact *cpt, uint16 **pSaveRoute);
 private:
 	uint16 checkBlock(uint16 *blockPos);
 	SkyGrid *_grid;