[Scummvm-git-logs] scummvm master -> d5acefa023d60ab91d1fbaf6bd0fd65b2174409f
dreammaster
dreammaster at scummvm.org
Sun Apr 29 01:15:51 CEST 2018
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
d5acefa023 XEEN: Further simplification in checkMoveDirection
Commit: d5acefa023d60ab91d1fbaf6bd0fd65b2174409f
https://github.com/scummvm/scummvm/commit/d5acefa023d60ab91d1fbaf6bd0fd65b2174409f
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2018-04-28T19:15:45-04:00
Commit Message:
XEEN: Further simplification in checkMoveDirection
Changed paths:
engines/xeen/interface.cpp
diff --git a/engines/xeen/interface.cpp b/engines/xeen/interface.cpp
index fbb91aa..c00079b 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]) {
More information about the Scummvm-git-logs
mailing list