diff options
| author | Max Horn | 2006-04-01 12:47:09 +0000 |
|---|---|---|
| committer | Max Horn | 2006-04-01 12:47:09 +0000 |
| commit | 0bb6d640647761ecd86eab6d1984dfb96b2e3a30 (patch) | |
| tree | cae5466656e9b779bbe2429b50226ac6f2ac5305 /engines/sword2/router.h | |
| parent | d10929b3945da6a2909e34c0cc2b730346a0a6b2 (diff) | |
| download | scummvm-rg350-0bb6d640647761ecd86eab6d1984dfb96b2e3a30.tar.gz scummvm-rg350-0bb6d640647761ecd86eab6d1984dfb96b2e3a30.tar.bz2 scummvm-rg350-0bb6d640647761ecd86eab6d1984dfb96b2e3a30.zip | |
A lot of code in sword1/router.cpp and sword2/router.cpp is virtually identical -- unified the two files in many places (but a lot more could be done, feel free to pick up and continue this work)
svn-id: r21526
Diffstat (limited to 'engines/sword2/router.h')
| -rw-r--r-- | engines/sword2/router.h | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/engines/sword2/router.h b/engines/sword2/router.h index 3b2fabf3fd..f2f87403c7 100644 --- a/engines/sword2/router.h +++ b/engines/sword2/router.h @@ -53,8 +53,7 @@ struct BarData { 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 + int32 co; // co = (y1*dx) - (x1*dy) from an equation for a line y*dx = x*dy + co }; struct NodeData { @@ -113,14 +112,9 @@ private: int32 _nBars; int32 _nNodes; - int32 _startX; - int32 _startY; - int32 _startDir; - int32 _targetX; - int32 _targetY; - int32 _targetDir; - int32 _scaleA; - int32 _scaleB; + int32 _startX, _startY, _startDir; + int32 _targetX, _targetY, _targetDir; + int32 _scaleA, _scaleB; RouteData _route[O_ROUTE_SIZE]; PathData _smoothPath[O_ROUTE_SIZE]; @@ -189,7 +183,7 @@ private: void slidyWalkAnimator(WalkData *walkAnim); #ifndef FORCE_SLIDY - int32 solidPath(); + void solidPath(); int32 solidWalkAnimator(WalkData *walkAnim); #endif |