From c0f47712c2ac160a571959a86fd4b711f058ed64 Mon Sep 17 00:00:00 2001
From: Joseph-Eugene Winzer
Date: Sun, 7 Jan 2018 22:16:58 +0100
Subject: 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.
---
 engines/supernova/state.cpp | 12 ++++++------
 1 file 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)) {
-- 
cgit v1.2.3