aboutsummaryrefslogtreecommitdiff
path: root/engines/startrek/awaymission.cpp
diff options
context:
space:
mode:
authorMatthew Stewart2018-07-04 22:06:59 -0400
committerEugene Sandulenko2018-08-09 08:37:30 +0200
commit5863f515f72904ab17f976a55264fc5a342fc90c (patch)
tree01d5c6819992026711d7b8fa5f2772c50a59f316 /engines/startrek/awaymission.cpp
parent8aef8c453918a583e1d804bf371437fef3b08e8c (diff)
downloadscummvm-rg350-5863f515f72904ab17f976a55264fc5a342fc90c.tar.gz
scummvm-rg350-5863f515f72904ab17f976a55264fc5a342fc90c.tar.bz2
scummvm-rg350-5863f515f72904ab17f976a55264fc5a342fc90c.zip
STARTREK: FEATHER5
Diffstat (limited to 'engines/startrek/awaymission.cpp')
-rw-r--r--engines/startrek/awaymission.cpp14
1 files changed, 6 insertions, 8 deletions
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: