From 19d0a3cce923572eae6a502226a57f0512d7113c Mon Sep 17 00:00:00 2001
From: Jaromir Wysoglad
Date: Fri, 31 May 2019 11:14:02 +0200
Subject: SUPERNOVA2: Fix airport message rendering

In the original game, the message or airport that
all other passangers left gets rendered only if
the intro isn't skipped. This commit does that.
---
 engines/supernova2/rooms.cpp | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/engines/supernova2/rooms.cpp b/engines/supernova2/rooms.cpp
index e56d162782..8c9a0f6a66 100644
--- a/engines/supernova2/rooms.cpp
+++ b/engines/supernova2/rooms.cpp
@@ -226,9 +226,13 @@ void Intro::onEntrance() {
 	_vm->_allowLoadGame = false;
 
 	titleScreen();
-	thoughts1() && tvDialogue() && thoughts2();
+	if (!(thoughts1() && tvDialogue() && thoughts2()))
+		_gm->_rooms[AIRPORT]->setRoomSeen(true);
 	_vm->paletteFadeOut();
 
+	for (int i = 0; i < 3; ++i)
+		_gm->_inventory.add(*_gm->_rooms[INTRO]->getObject(i));
+
 	_gm->changeRoom(AIRPORT);
 	_gm->_guiEnabled = true;
 	_vm->_allowSaveGame = true;
@@ -512,9 +516,6 @@ Airport::Airport(Supernova2Engine *vm, GameManager *gm) {
 }
 
 void Airport::onEntrance() {
-	for (int i = 0; i < 3; ++i)
-		_gm->_inventory.add(*_gm->_rooms[INTRO]->getObject(i));
-
 	if (hasSeen() == false) {
 		_vm->renderMessage(kStringAirportEntrance);
 	}
-- 
cgit v1.2.3