aboutsummaryrefslogtreecommitdiff
path: root/engines/supernova
diff options
context:
space:
mode:
authorJoseph-Eugene Winzer2018-01-07 22:16:58 +0100
committerThierry Crozat2018-01-23 02:15:46 +0000
commitc0f47712c2ac160a571959a86fd4b711f058ed64 (patch)
tree606f0ebc0ddab857f05da3c69dbc1b87453b9172 /engines/supernova
parentfa1e93a15eda76022193d97fa4a1c5fa8e0ecf42 (diff)
downloadscummvm-rg350-c0f47712c2ac160a571959a86fd4b711f058ed64.tar.gz
scummvm-rg350-c0f47712c2ac160a571959a86fd4b711f058ed64.tar.bz2
scummvm-rg350-c0f47712c2ac160a571959a86fd4b711f058ed64.zip
SUPERNOVA: Changes message order
When taking off your helmet or life support in a room without oxygen, it showed the death screen before the 'taking off helmet/life support' message.
Diffstat (limited to 'engines/supernova')
-rw-r--r--engines/supernova/state.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/engines/supernova/state.cpp b/engines/supernova/state.cpp
index ff758f7fe6..6a57610504 100644
--- a/engines/supernova/state.cpp
+++ b/engines/supernova/state.cpp
@@ -2112,11 +2112,11 @@ bool GameManager::genericInteract(Action verb, Object &obj1, Object &obj2) {
} else
_vm->renderMessage(kStringGenericInteract_22);
} else if (obj1.hasProperty(WORN)) {
- if (airless())
- dead(kStringGenericInteract_23);
-
obj1.disableProperty(WORN);
_vm->renderMessage(kStringGenericInteract_24);
+ getInput();
+ if (airless())
+ dead(kStringGenericInteract_23);
} else {
Room *r = _rooms[AIRLOCK];
if (r->getObject(5)->hasProperty(WORN)) {
@@ -2136,11 +2136,11 @@ bool GameManager::genericInteract(Action verb, Object &obj1, Object &obj2) {
} else
_vm->renderMessage(kStringGenericInteract_22);
} else if (obj1.hasProperty(WORN)) {
- if (airless())
- dead(kStringGenericInteract_27);
-
obj1.disableProperty(WORN);
_vm->renderMessage(kStringGenericInteract_28);
+ getInput();
+ if (airless())
+ dead(kStringGenericInteract_27);
} else {
Room *r = _rooms[AIRLOCK];
if (r->getObject(5)->hasProperty(WORN)) {