[Scummvm-cvs-logs] CVS: scummvm/sky autoroute.cpp,1.1,1.2 autoroute.h,1.2,1.3 sky.cpp,1.21,1.22 sky.h,1.16,1.17
Oliver Kiehl
olki at users.sourceforge.net
Sun Apr 27 08:44:02 CEST 2003
Update of /cvsroot/scummvm/scummvm/sky
In directory sc8-pr-cvs1:/tmp/cvs-serv5749
Modified Files:
autoroute.cpp autoroute.h sky.cpp sky.h
Log Message:
fixed cvs and modified autoroute parameters. removed initialisation from
SkyState since it is only needed by SkyLogic
Index: autoroute.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/autoroute.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- autoroute.cpp 27 Apr 2003 15:02:52 -0000 1.1
+++ autoroute.cpp 27 Apr 2003 15:43:08 -0000 1.2
@@ -52,14 +52,14 @@
return retVal;
}
-uint16 SkyAutoRoute::autoRoute(Compact *cpt) {
+uint16 SkyAutoRoute::autoRoute(Compact *cpt, uint16 *routeCalc) {
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
- uint16* routeCalc = _routeGrid + (ROUTE_GRID_SIZE >> 1) - 1;
+ routeCalc = _routeGrid + (ROUTE_GRID_SIZE >> 1) - 1;
uint8 stretch1, stretch2; // bl / bh
stretch1 = 0;
@@ -343,4 +343,5 @@
// saveRoute should now point to routeData
if (routeData > saveRoute) error("Autoroute: Internal pointer error! routeData overflow.");
return 1;
-}
\ No newline at end of file
+}
+
Index: autoroute.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/autoroute.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- autoroute.h 27 Apr 2003 15:08:35 -0000 1.2
+++ autoroute.h 27 Apr 2003 15:43:08 -0000 1.3
@@ -24,6 +24,7 @@
#define __AutoRoute__
#include "stdafx.h"
+#include "sky/sky.h"
#include "struc.h"
#include "compact.h"
#include "grid.h"
@@ -35,11 +36,12 @@
public:
SkyAutoRoute(SkyGrid *pGrid);
~SkyAutoRoute(void);
- uint16 autoRoute(Compact *cpt);
+ uint16 autoRoute(Compact *cpt, uint16 *routeCalc);
private:
uint16 checkBlock(uint16 *blockPos);
SkyGrid *_grid;
uint16 *_routeGrid;
};
-#endif // __AutoRoute
\ No newline at end of file
+#endif // __AutoRoute
+
Index: sky.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/sky.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- sky.cpp 27 Apr 2003 15:08:35 -0000 1.21
+++ sky.cpp 27 Apr 2003 15:43:08 -0000 1.22
@@ -117,7 +117,6 @@
//initialiseRouter();
_skyText = getSkyText();
_grid = new SkyGrid(_skyDisk);
- _autoRoute = new SkyAutoRoute(_grid);
_skyLogic = new SkyLogic(_skyDisk, _grid);
}
Index: sky.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/sky.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- sky.h 27 Apr 2003 15:08:35 -0000 1.16
+++ sky.h 27 Apr 2003 15:43:08 -0000 1.17
@@ -33,7 +33,6 @@
#include "sky/struc.h"
#include "sky/skymusic.h"
#include "sky/grid.h"
-#include "sky/autoroute.h"
class SkyLogic;
class SkyGrid;
@@ -77,7 +76,6 @@
SkyGrid *_grid;
SkyLogic *_skyLogic;
SkyMusic *_music;
- SkyAutoRoute *_autoRoute;
byte *_workScreen;
byte *_backScreen;
More information about the Scummvm-git-logs
mailing list