From 5863f515f72904ab17f976a55264fc5a342fc90c Mon Sep 17 00:00:00 2001 From: Matthew Stewart Date: Wed, 4 Jul 2018 22:06:59 -0400 Subject: STARTREK: FEATHER5 --- engines/startrek/awaymission.cpp | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'engines/startrek/awaymission.cpp') diff --git a/engines/startrek/awaymission.cpp b/engines/startrek/awaymission.cpp index 8c7f8db51e..819319e296 100644 --- a/engines/startrek/awaymission.cpp +++ b/engines/startrek/awaymission.cpp @@ -613,16 +613,14 @@ void StarTrekEngine::handleAwayMissionAction() { showTextbox("", getLoadedText(GROUNDTX_LOOK_SPOCK), 20, 20, TEXTCOLOR_YELLOW, 0); else if (action.activeObject() == OBJECT_MCCOY) showTextbox("", getLoadedText(GROUNDTX_LOOK_MCCOY), 20, 20, TEXTCOLOR_YELLOW, 0); - else { - if (action.activeObject() == OBJECT_REDSHIRT) - showTextbox("", getLoadedText(GROUNDTX_LOOK_REDSHIRT), 20, 20, TEXTCOLOR_YELLOW, 0); - + else if (action.activeObject() == OBJECT_REDSHIRT) + showTextbox("", getLoadedText(GROUNDTX_LOOK_REDSHIRT), 20, 20, TEXTCOLOR_YELLOW, 0); + else // Show generic "nothing of note" text. - // BUG? This text is also shown after looking at the redshirt. However, his - // text is normally overridden on a per-mission basis, so perhaps this bug - // never manifests itself? + // BUGFIX: originally this was shown after the redshirt's text as well. + // Though, the original game may not have used this default implementation + // anywhere... showTextbox("", getLoadedText(GROUNDTX_LOOK_ANYWHERE), 20, 20, TEXTCOLOR_YELLOW, 0); - } break; case ACTION_TALK: -- cgit v1.2.3