aboutsummaryrefslogtreecommitdiff
path: root/engines/cge/walk.cpp
diff options
context:
space:
mode:
authorPaul Gilbert2011-08-19 19:49:05 +1000
committerPaul Gilbert2011-08-19 19:49:05 +1000
commit0d730b85e3e05829ba5ce3fbcdbf2886a9a28a94 (patch)
treed25a13e7dbbe22328ce4c7e6ca4d3aaa10254f78 /engines/cge/walk.cpp
parent40ea6d788bfabb9d692377fa0baf87b3e5824e0c (diff)
downloadscummvm-rg350-0d730b85e3e05829ba5ce3fbcdbf2886a9a28a94.tar.gz
scummvm-rg350-0d730b85e3e05829ba5ce3fbcdbf2886a9a28a94.tar.bz2
scummvm-rg350-0d730b85e3e05829ba5ce3fbcdbf2886a9a28a94.zip
CGE: Changed the Sprite bit-flags into a union, to fix savegame endian issues
Diffstat (limited to 'engines/cge/walk.cpp')
-rw-r--r--engines/cge/walk.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/engines/cge/walk.cpp b/engines/cge/walk.cpp
index a418bfb178..36fecdd22b 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._hide)
+ if (_flags.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._near) {
+ if (!spr->_flags.flags._near) {
_vm->feedSnail(spr, kNear);
- spr->_flags._near = true;
+ spr->_flags.flags._near = true;
}
} else {
- spr->_flags._near = false;
+ spr->_flags.flags._near = false;
}
}
}
- if (_flags._hold || _tracePtr < 0)
+ if (_flags.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._east)
+ if (spr->_flags.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._east;
+ mode = spr->_flags.flags._east;
if (lower(spr))
mode += 2;
}