diff options
| author | Matthew Stewart | 2018-07-10 00:26:20 -0400 |
|---|---|---|
| committer | Eugene Sandulenko | 2018-08-09 08:37:30 +0200 |
| commit | 2771797eb0cb93b6a7672904dd81f9deeecdba0d (patch) | |
| tree | c9cafd603abd275b7fcc873a7c56138117313a68 /engines/startrek/awaymission.cpp | |
| parent | 2f3c4b90d756504daa45cb88ef3fd899a87fe51f (diff) | |
| download | scummvm-rg350-2771797eb0cb93b6a7672904dd81f9deeecdba0d.tar.gz scummvm-rg350-2771797eb0cb93b6a7672904dd81f9deeecdba0d.tar.bz2 scummvm-rg350-2771797eb0cb93b6a7672904dd81f9deeecdba0d.zip | |
STARTREK: "Use" action was bypassing "disableWalk"
When objects could be walked to by "using" them, this bypassed the
"disableWalk" variable.
Diffstat (limited to 'engines/startrek/awaymission.cpp')
| -rw-r--r-- | engines/startrek/awaymission.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
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); } |