[Scummvm-git-logs] scummvm master -> d320bc569ab5528841d201a27b2c2396d11982ed

[dreammaster]

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:
d320bc569a XEEN: Fix check for if party has swimming skill


Commit: d320bc569ab5528841d201a27b2c2396d11982ed
    https://github.com/scummvm/scummvm/commit/d320bc569ab5528841d201a27b2c2396d11982ed
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2018-03-28T22:38:14-04:00

Commit Message:
XEEN: Fix check for if party has swimming skill

Changed paths:
    engines/xeen/interface.cpp


diff --git a/engines/xeen/interface.cpp b/engines/xeen/interface.cpp
index 201f98c..9d195f7 100644
--- a/engines/xeen/interface.cpp
+++ b/engines/xeen/interface.cpp
@@ -974,11 +974,8 @@ bool Interface::checkMoveDirection(int key) {
 		} else {
 			party._mazeDirection = dir;
 
-			if (startSurfaceId == SURFTYPE_SWAMP || party.checkSkill(SWIMMING) ||
+			if (startSurfaceId != SURFTYPE_SWAMP || party.checkSkill(SWIMMING) ||
 					party._walkOnWaterActive) {
-				sound.playFX(46);
-				return false;
-			} else {
 				if (_buttonValue == Common::KEYCODE_UP && _wo[107]) {
 					_openDoor = true;
 					sound.playFX(47);
@@ -986,6 +983,9 @@ bool Interface::checkMoveDirection(int key) {
 					_openDoor = false;
 				}
 				return true;
+			} else {
+				sound.playFX(46);
+				return false;
 			}
 		}
 	}