From 2771797eb0cb93b6a7672904dd81f9deeecdba0d Mon Sep 17 00:00:00 2001
From: Matthew Stewart
Date: Tue, 10 Jul 2018 00:26:20 -0400
Subject: STARTREK: "Use" action was bypassing "disableWalk"

When objects could be walked to by "using" them, this bypassed the
"disableWalk" variable.
---
 engines/startrek/awaymission.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'engines/startrek/awaymission.cpp')

diff --git a/engines/startrek/awaymission.cpp b/engines/startrek/awaymission.cpp
index 819319e296..e086bca045 100644
--- a/engines/startrek/awaymission.cpp
+++ b/engines/startrek/awaymission.cpp
@@ -515,7 +515,8 @@ void StarTrekEngine::handleAwayMissionAction() {
 		if (action.activeObject() != action.passiveObject()) {
 			switch (action.activeObject()) {
 			case OBJECT_KIRK:
-				if (!_room->handleAction(ACTION_WALK, action.passiveObject(), 0, 0)
+				// BUGFIX: Don't allow the "use" action to bypass the "disableWalking" variable
+				if (!(!_awayMission.disableWalking && _room->handleAction(ACTION_WALK, action.passiveObject(), 0, 0))
 						&& !_room->handleAction(ACTION_GET, action.passiveObject(), 0, 0)) {
 					showTextbox("Capt. Kirk", getLoadedText(GROUNDTX_KIRK_USE), 20, 20, TEXTCOLOR_YELLOW, 0);
 				}
-- 
cgit v1.2.3