diff options
author | Paul Gilbert | 2011-08-19 20:36:43 +1000 |
---|---|---|
committer | Paul Gilbert | 2011-08-19 20:36:43 +1000 |
commit | 372d488b3bc01f6dce06dde83d4818a010695c70 (patch) | |
tree | 967192cca7a336e4e18fd155d7f134c465374a3e /engines/cge/walk.cpp | |
parent | 0d730b85e3e05829ba5ce3fbcdbf2886a9a28a94 (diff) | |
download | scummvm-rg350-372d488b3bc01f6dce06dde83d4818a010695c70.tar.gz scummvm-rg350-372d488b3bc01f6dce06dde83d4818a010695c70.tar.bz2 scummvm-rg350-372d488b3bc01f6dce06dde83d4818a010695c70.zip |
CGE: Revert previous commit of flags synchronisation
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 36fecdd22b..a418bfb178 100644 --- a/engines/cge/walk.cpp +++ b/engines/cge/walk.cpp @@ -75,7 +75,7 @@ Walk::Walk(CGEEngine *vm, BitmapPtr *shpl) void Walk::tick() { - if (_flags.flags._hide) + if (_flags._hide) return; _here = XZ(_x + _w / 2, _y + _h); @@ -85,17 +85,17 @@ void Walk::tick() { _sys->funTouch(); for (spr = _vga->_showQ->first(); spr; spr = spr->_next) { if (distance(spr) < 2) { - if (!spr->_flags.flags._near) { + if (!spr->_flags._near) { _vm->feedSnail(spr, kNear); - spr->_flags.flags._near = true; + spr->_flags._near = true; } } else { - spr->_flags.flags._near = false; + spr->_flags._near = false; } } } - if (_flags.flags._hold || _tracePtr < 0) + if (_flags._hold || _tracePtr < 0) park(); else { if (_here == _trace[_tracePtr]) { @@ -187,7 +187,7 @@ void Walk::findWay(Sprite *spr) { if (spr && spr != this) { int x = spr->_x; int z = spr->_z; - if (spr->_flags.flags._east) + if (spr->_flags._east) x += spr->_w + _w / 2 - kWalkSide; else x -= _w / 2 - kWalkSide; @@ -207,7 +207,7 @@ void Walk::reach(Sprite *spr, int mode) { if (spr) { _hero->findWay(spr); if (mode < 0) { - mode = spr->_flags.flags._east; + mode = spr->_flags._east; if (lower(spr)) mode += 2; } |