diff options
author | Andrew Kurushin | 2005-07-29 17:42:33 +0000 |
---|---|---|
committer | Andrew Kurushin | 2005-07-29 17:42:33 +0000 |
commit | 2efc7edb1a2791bf607775d118e331fd4bf161e0 (patch) | |
tree | 2b9afa48a3b5051b6ee85011486966ad59a4767a /saga/interface.cpp | |
parent | c2882ce681dbbfd3ee13277b1f1faf928cc62151 (diff) | |
download | scummvm-rg350-2efc7edb1a2791bf607775d118e331fd4bf161e0.tar.gz scummvm-rg350-2efc7edb1a2791bf607775d118e331fd4bf161e0.tar.bz2 scummvm-rg350-2efc7edb1a2791bf607775d118e331fd4bf161e0.zip |
fix setStatusText
svn-id: r18593
Diffstat (limited to 'saga/interface.cpp')
-rw-r--r-- | saga/interface.cpp | 15 |
1 files changed, 12 insertions, 3 deletions
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(); } } |