[Scummvm-cvs-logs] CVS: scummvm/bs2 router.cpp,1.13,1.14 router.h,1.2,1.3

[Torbj?rn Andersson]

Update of /cvsroot/scummvm/scummvm/bs2
In directory sc8-pr-cvs1:/tmp/cvs-serv26942

Modified Files:
	router.cpp router.h 
Log Message:
Cleanup. I removed the PLOT_PATHS blocks since they depended on some
functions we don't have, and since I didn't deem them useful to us. But
feel free to put them back if you like to.

I'd also like to take this opportunity to say that while I deeply admire
how smoothly BS2 handles the transition between stock animations (e.g.
walking) and special-purpose animations, it certainly needs an unholy
amount of code to do so.


Index: router.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/router.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- router.cpp	19 Sep 2003 15:01:49 -0000	1.13
+++ router.cpp	20 Sep 2003 15:34:53 -0000	1.14
@@ -17,21 +17,23 @@
  * $Header$
  */
 
-//--------------------------------------------------------------------------------------
+// ---------------------------------------------------------------------------
 // ROUTER.CPP by James
-
-// A rehash of Jeremy's original jrouter.c, containing low-level system routines
-// for calculating routes between points inside a walk-grid, and constructing
-// walk animations from mega-sets.
-
[...4616 lines suppressed...]
-{
+
+void RemoveWalkGrid(int32 gridResource) {
 	int entry;
 
 	// first, scan list to see if this grid is actually there
-	entry=0;
-	while ((entry < MAX_WALKGRIDS) && (walkGridList[entry] != gridResource))
+	entry = 0;
+	while (entry < MAX_WALKGRIDS && walkGridList[entry] != gridResource)
 		entry++;
 
-	if (entry < MAX_WALKGRIDS)	// if we've found it in the list, reset entry to zero (otherwise just ignore the request)
+	// if we've found it in the list, reset entry to zero (otherwise just
+	// ignore the request)
+	if (entry < MAX_WALKGRIDS)
 		walkGridList[entry] = 0;
 }
-//--------------------------------------------------------------------------------------
-

Index: router.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/router.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- router.h	13 Sep 2003 20:42:08 -0000	1.2
+++ router.h	20 Sep 2003 15:34:53 -0000	1.3
@@ -20,7 +20,6 @@
 #ifndef _ROUTER_H
 #define _ROUTER_H
 
-//#include "src\driver96.h"
 #include "memory.h"
 #include "object.h"
 
@@ -28,44 +27,40 @@
 	#pragma START_PACK_STRUCTS
 #endif
 
-typedef	struct _walkData
-{
-	uint16	frame;
-	int16	x;
-	int16	y;
-	uint8	step;
-	uint8	dir;
+typedef	struct _walkData {
+	uint16 frame;
+	int16 x;
+	int16 y;
+	uint8 step;
+	uint8 dir;
 } GCC_PACK _walkData;
 
-typedef struct
-{
-	int16   x1;
-  	int16   y1;
-  	int16   x2;
-	int16   y2;
-	int16   xmin;
-	int16   ymin;
-	int16   xmax;
-	int16   ymax;
-	int16   dx;	   // x2 - x1
-	int16   dy;	   // y2 - y1
-	int32   co;	   // co = (y1 *dx)- (x1*dy) from an equation for a line y*dx = x*dy + co
+typedef struct {
+	int16 x1;
+  	int16 y1;
+  	int16 x2;
+	int16 y2;
+	int16 xmin;
+	int16 ymin;
+	int16 xmax;
+	int16 ymax;
+	int16 dx;	// x2 - x1
+	int16 dy;	// y2 - y1
+	int32 co;	// co = (y1 *dx)- (x1*dy) from an equation for a line y*dx = x*dy + co
 } GCC_PACK _barData;
 
-typedef struct
-{
-	int16   x;
-	int16   y;
-	int16	level;
-	int16   prev;
-	int16   dist;
+typedef struct {
+	int16 x;
+	int16 y;
+	int16 level;
+	int16 prev;
+	int16 dist;
 } GCC_PACK _nodeData;
 
 #if !defined(__GNUC__)
 	#pragma END_PACK_STRUCTS
 #endif
 
-
 int32 RouteFinder(Object_mega *ob_mega, Object_walkdata *ob_walkdata, int32 x, int32 y, int32 dir);
 
 void EarlySlowOut(Object_mega *ob_mega, Object_walkdata *ob_walkdata);
@@ -79,9 +74,5 @@
 void AddWalkGrid(int32 gridResource);
 void RemoveWalkGrid(int32 gridResource);
 void ClearWalkGridList(void);
-uint8 CheckForCollision(void);
-
-//--------------------------------------------------------------------------------------
-
 
 #endif