From 2efc7edb1a2791bf607775d118e331fd4bf161e0 Mon Sep 17 00:00:00 2001
From: Andrew Kurushin
Date: Fri, 29 Jul 2005 17:42:33 +0000
Subject: fix setStatusText

svn-id: r18593
---
 saga/interface.cpp | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

(limited to 'saga/interface.cpp')

diff --git a/saga/interface.cpp b/saga/interface.cpp
index 8b4687d283..ba652f9f0a 100644
--- a/saga/interface.cpp
+++ b/saga/interface.cpp
@@ -298,7 +298,7 @@ void Interface::setMode(int mode) {
 		mapPanelShow();
 		break;
 	case kPanelSceneSubstitute:
-		_vm->_render->setFlag(RF_PLACARD);
+		_vm->_render->setFlag(RF_DEMO_SUBST);
 		_vm->_gfx->getCurrentPal(_mapSavedPal);
 		break;
 	}
@@ -447,9 +447,10 @@ bool Interface::processAscii(uint16 ascii, bool synthetic) {
 		break;
 	case kPanelSceneSubstitute:
 		if (ascii == 13) {
-			_vm->_render->clearFlag(RF_PLACARD);
+			_vm->_render->clearFlag(RF_DEMO_SUBST);
 			_vm->_gfx->setPalette(_mapSavedPal);
 			setMode(kPanelMain);
+			_vm->_script->setNoPendingVerb();
 		} else if (ascii == 'q' || ascii == 'Q') {
 			_vm->shutDown();
 		}
@@ -554,6 +555,13 @@ void Interface::draw() {
 	if (_vm->_scene->isInDemo() || _fadeMode == kFadeOut)
 		return;
 
+	// Disable this for IHNM for now, since that game uses the full screen
+	// in some cases.
+
+	if (_vm->getGameType() == GType_IHNM) {
+		return;
+	}
+
 	drawStatusBar();
 
 	if (_panelMode == kPanelMain) {
@@ -1311,9 +1319,10 @@ void Interface::update(const Point& mousePoint, int updateFlag) {
 
 	if (_panelMode == kPanelSceneSubstitute) {
 		if (updateFlag & UPDATE_MOUSECLICK) {
-			_vm->_render->clearFlag(RF_PLACARD);
+			_vm->_render->clearFlag(RF_DEMO_SUBST);
 			_vm->_gfx->setPalette(_mapSavedPal);
 			setMode(kPanelMain);
+			_vm->_script->setNoPendingVerb();
 		}
 	}
 
-- 
cgit v1.2.3