diff options
| author | Strangerke | 2011-07-21 01:56:40 +0200 |
|---|---|---|
| committer | Strangerke | 2011-07-21 01:56:40 +0200 |
| commit | 5d41ab8b5fd778f206633157ffa87efc31f643cf (patch) | |
| tree | 152613779495a619e161daffbe7711510e475c37 /engines/cge/walk.cpp | |
| parent | 9576e415e2779011ecfca77a2f9642c011a928a2 (diff) | |
| download | scummvm-rg350-5d41ab8b5fd778f206633157ffa87efc31f643cf.tar.gz scummvm-rg350-5d41ab8b5fd778f206633157ffa87efc31f643cf.tar.bz2 scummvm-rg350-5d41ab8b5fd778f206633157ffa87efc31f643cf.zip | |
CGE: Rename some more constants, remove some useless ones
Diffstat (limited to 'engines/cge/walk.cpp')
| -rw-r--r-- | engines/cge/walk.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/engines/cge/walk.cpp b/engines/cge/walk.cpp index b35864f16e..f07ed4ece2 100644 --- a/engines/cge/walk.cpp +++ b/engines/cge/walk.cpp @@ -130,8 +130,8 @@ void WALK::tick() { } step(); if ((Dir == WW && _x <= 0) || - (Dir == EE && _x + _w >= SCR_WID) || - (Dir == SS && _y + _w >= WORLD_HIG - 2)) + (Dir == EE && _x + _w >= kScrWidth) || + (Dir == SS && _y + _w >= kWorldHeight - 2)) park(); else { signed char x; // dummy var @@ -143,9 +143,9 @@ void WALK::tick() { int WALK::distance(Sprite *spr) { int dx, dz; - dx = spr->_x - (_x + _w - WALKSIDE); + dx = spr->_x - (_x + _w - kWalkSide); if (dx < 0) - dx = (_x + WALKSIDE) - (spr->_x + spr->_w); + dx = (_x + kWalkSide) - (spr->_x + spr->_w); if (dx < 0) dx = 0; @@ -208,11 +208,11 @@ void WALK::findWay(Sprite *spr) { int x = spr->_x; int z = spr->_z; if (spr->_flags._east) - x += spr->_w + _w / 2 - WALKSIDE; + x += spr->_w + _w / 2 - kWalkSide; else - x -= _w / 2 - WALKSIDE; + x -= _w / 2 - kWalkSide; findWay(Cluster((x / MAP_XGRID), - ((z < MAP_ZCNT - MAX_DISTANCE) ? (z + 1) + ((z < MAP_ZCNT - kDistMax) ? (z + 1) : (z - 1)))); } } |