diff options
| author | Paul Gilbert | 2013-10-20 13:47:06 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2013-10-20 13:47:06 -0400 |
| commit | b6bace0fa070985f5301480c36318043ef7b025e (patch) | |
| tree | dcdc786032b43a4c099348c68f79ab94069b8c31 /engines/tsage/core.cpp | |
| parent | 0a4a14c9c948bd04e28ef46bede7c7e4f821e557 (diff) | |
| download | scummvm-rg350-b6bace0fa070985f5301480c36318043ef7b025e.tar.gz scummvm-rg350-b6bace0fa070985f5301480c36318043ef7b025e.tar.bz2 scummvm-rg350-b6bace0fa070985f5301480c36318043ef7b025e.zip | |
TSAGE: Further R2R fixes for voice playback looking at hotspots
Diffstat (limited to 'engines/tsage/core.cpp')
| -rw-r--r-- | engines/tsage/core.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/engines/tsage/core.cpp b/engines/tsage/core.cpp index 3021134b46..8021160514 100644 --- a/engines/tsage/core.cpp +++ b/engines/tsage/core.cpp @@ -1619,7 +1619,8 @@ void SceneItem::display(int resNum, int lineNum, ...) { Common::String msg = (!resNum || (resNum == -1)) ? Common::String() : g_resourceManager->getMessage(resNum, lineNum); - if ((g_vm->getGameID() != GType_Ringworld) && T2_GLOBALS._uiElements._active) + if ((g_vm->getGameID() != GType_Ringworld) && (g_vm->getGameID() != GType_Ringworld2) + && T2_GLOBALS._uiElements._active) T2_GLOBALS._uiElements.hide(); if (g_globals->_sceneObjects->contains(&g_globals->_sceneText)) { @@ -1797,7 +1798,8 @@ void SceneItem::display(int resNum, int lineNum, ...) { g_globals->_sceneText.remove(); } - if ((g_vm->getGameID() != GType_Ringworld) && T2_GLOBALS._uiElements._active) { + if ((g_vm->getGameID() != GType_Ringworld) && (g_vm->getGameID() != GType_Ringworld2) + && T2_GLOBALS._uiElements._active) { // Show user interface T2_GLOBALS._uiElements.show(); |