diff options
| author | Max Horn | 2008-05-06 15:21:46 +0000 |
|---|---|---|
| committer | Max Horn | 2008-05-06 15:21:46 +0000 |
| commit | ba6c4a6239d5496f0f218d8fa76c11e77bf9139e (patch) | |
| tree | 8c7c9d3d32b38e8ddd10499ab10e2b63b5eb8f36 /engines/parallaction/walk.cpp | |
| parent | 4331411ebea61072ff0189d7d61ac57199a120af (diff) | |
| parent | 397e04d0b1ff6d96502c4eca42c1ab4a31b2dbcd (diff) | |
| download | scummvm-rg350-ba6c4a6239d5496f0f218d8fa76c11e77bf9139e.tar.gz scummvm-rg350-ba6c4a6239d5496f0f218d8fa76c11e77bf9139e.tar.bz2 scummvm-rg350-ba6c4a6239d5496f0f218d8fa76c11e77bf9139e.zip | |
Merge with trunk, using the svnmerge tool
svn-id: r31898
Diffstat (limited to 'engines/parallaction/walk.cpp')
| -rw-r--r-- | engines/parallaction/walk.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/parallaction/walk.cpp b/engines/parallaction/walk.cpp index 3272a16179..0a8ded9e29 100644 --- a/engines/parallaction/walk.cpp +++ b/engines/parallaction/walk.cpp @@ -355,15 +355,15 @@ uint16 Parallaction::checkDoor() { z = hitZone(kZoneTrap, foot.x, foot.y); if (z) { - _localFlags[_currentLocationIndex] |= kFlagsEnter; + setLocationFlags(kFlagsEnter); runCommands(z->_commands, z); - _localFlags[_currentLocationIndex] &= ~kFlagsEnter; + clearLocationFlags(kFlagsEnter); _zoneTrap = z; } else if (_zoneTrap) { - _localFlags[_currentLocationIndex] |= kFlagsExit; + setLocationFlags(kFlagsExit); runCommands(_zoneTrap->_commands, _zoneTrap); - _localFlags[_currentLocationIndex] &= ~kFlagsExit; + clearLocationFlags(kFlagsExit); _zoneTrap = nullZonePtr; } |