aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Gilbert2018-04-28 19:15:45 -0400
committerPaul Gilbert2018-04-28 19:15:45 -0400
commitd5acefa023d60ab91d1fbaf6bd0fd65b2174409f (patch)
treeca54489e2b88a1447e2f28d235d4f9099c2defb3
parentb9e8320de7830a72c75ce7a3134aee162f27bfe2 (diff)
downloadscummvm-rg350-d5acefa023d60ab91d1fbaf6bd0fd65b2174409f.tar.gz
scummvm-rg350-d5acefa023d60ab91d1fbaf6bd0fd65b2174409f.tar.bz2
scummvm-rg350-d5acefa023d60ab91d1fbaf6bd0fd65b2174409f.zip
XEEN: Further simplification in checkMoveDirection
-rw-r--r--engines/xeen/interface.cpp9
1 files changed, 4 insertions, 5 deletions
diff --git a/engines/xeen/interface.cpp b/engines/xeen/interface.cpp
index fbb91aa7e5..c00079b73b 100644
--- a/engines/xeen/interface.cpp
+++ b/engines/xeen/interface.cpp
@@ -921,7 +921,11 @@ bool Interface::checkMoveDirection(int key) {
break;
}
+ // Get next facing tile information, and then reset back to the old direction (if changed)
map.getCell(7);
+ party._mazeDirection = dir;
+
+
int startSurfaceId = map._currentSurfaceId;
int surfaceId;
@@ -929,8 +933,6 @@ bool Interface::checkMoveDirection(int key) {
return true;
if (map._isOutdoors) {
- party._mazeDirection = dir;
-
switch (map._currentWall) {
case 5:
if (_vm->_files->_ccNum)
@@ -976,12 +978,9 @@ bool Interface::checkMoveDirection(int key) {
} else {
surfaceId = map.getCell(2);
if (surfaceId >= map.mazeData()._difficulties._wallNoPass) {
- party._mazeDirection = dir;
sound.playFX(46);
return false;
} else {
- party._mazeDirection = dir;
-
if (startSurfaceId != SURFTYPE_SWAMP || party.checkSkill(SWIMMING) ||
party._walkOnWaterActive) {
if (_buttonValue == Common::KEYCODE_UP && _wo[107]) {