diff options
author | Torbjörn Andersson | 2003-09-20 15:34:53 +0000 |
---|---|---|
committer | Torbjörn Andersson | 2003-09-20 15:34:53 +0000 |
commit | 4eca44704bb8d19f6d2279b83d2ebfa9778ac054 (patch) | |
tree | f9f10bf782aef264755be87a3d71f3c0a879cea6 /sword2/router.h | |
parent | c704c30575db24ce2b1e2d0b5370750904de735f (diff) | |
download | scummvm-rg350-4eca44704bb8d19f6d2279b83d2ebfa9778ac054.tar.gz scummvm-rg350-4eca44704bb8d19f6d2279b83d2ebfa9778ac054.tar.bz2 scummvm-rg350-4eca44704bb8d19f6d2279b83d2ebfa9778ac054.zip |
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.
svn-id: r10336
Diffstat (limited to 'sword2/router.h')
-rw-r--r-- | sword2/router.h | 57 |
1 files changed, 24 insertions, 33 deletions
diff --git a/sword2/router.h b/sword2/router.h index 364b884a61..b22a23fef1 100644 --- a/sword2/router.h +++ b/sword2/router.h @@ -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 PlotWalkGrid(void); void AddWalkGrid(int32 gridResource); void RemoveWalkGrid(int32 gridResource); void ClearWalkGridList(void); -uint8 CheckForCollision(void); - -//-------------------------------------------------------------------------------------- - #endif |