diff options
author | Paul Gilbert | 2018-02-01 22:19:36 -0500 |
---|---|---|
committer | Paul Gilbert | 2018-02-01 22:19:36 -0500 |
commit | 53f922b1d7b06979f23921af107d2a444848465f (patch) | |
tree | eb26b1e11afda955f92e2bc2e2339db713bbf755 /engines/xeen/worldofxeen | |
parent | 39b2a2f13787d254db2b227d74421a2a50eeedd3 (diff) | |
download | scummvm-rg350-53f922b1d7b06979f23921af107d2a444848465f.tar.gz scummvm-rg350-53f922b1d7b06979f23921af107d2a444848465f.tar.bz2 scummvm-rg350-53f922b1d7b06979f23921af107d2a444848465f.zip |
XEEN: Fix display of dragon text at start of World ending
Diffstat (limited to 'engines/xeen/worldofxeen')
-rw-r--r-- | engines/xeen/worldofxeen/darkside_cutscenes.cpp | 6 | ||||
-rw-r--r-- | engines/xeen/worldofxeen/worldofxeen_cutscenes.cpp | 9 |
2 files changed, 8 insertions, 7 deletions
diff --git a/engines/xeen/worldofxeen/darkside_cutscenes.cpp b/engines/xeen/worldofxeen/darkside_cutscenes.cpp index d0fe869fd0..d9cf3e1287 100644 --- a/engines/xeen/worldofxeen/darkside_cutscenes.cpp +++ b/engines/xeen/worldofxeen/darkside_cutscenes.cpp @@ -1205,6 +1205,7 @@ void DarkSideCutscenes::showPharaohEndText(const char *msg1, const char *msg2, c // Show each page until a key is pressed do { // Draw the dragon pharoah + events.updateGameCounter(); screen.restoreBackground(); claw.draw(0, 5, Common::Point(CUTSCENES_XLIST[idx], CUTSCENES_YLIST[idx]), SPRFLAG_800); claw.draw(0, 6, Common::Point(145, 185)); @@ -1220,10 +1221,9 @@ void DarkSideCutscenes::showPharaohEndText(const char *msg1, const char *msg2, c text[pageNum]); windows[39].writeString(str2); + windows[0].update(); + events.wait(3); idx = (idx + 1) % 32; - screen.update(); - - events.pollEventsAndWait(); } while (!_vm->shouldQuit() && !events.isKeyMousePressed()); events.clearEvents(); diff --git a/engines/xeen/worldofxeen/worldofxeen_cutscenes.cpp b/engines/xeen/worldofxeen/worldofxeen_cutscenes.cpp index 170a2ca54a..1947260732 100644 --- a/engines/xeen/worldofxeen/worldofxeen_cutscenes.cpp +++ b/engines/xeen/worldofxeen/worldofxeen_cutscenes.cpp @@ -49,7 +49,7 @@ void WorldOfXeenCutscenes::worldEnding1() { Window &w0 = windows[0]; Graphics::ManagedSurface savedBg(SCREEN_WIDTH, SCREEN_HEIGHT); - files.setGameCc(1); + files.setGameCc(0); sound.playSong("outday3.m"); showPharaohEndText(Res.WORLD_END_TEXT[0], nullptr, nullptr); sound.playSound("elect.voc"); @@ -659,9 +659,10 @@ void WorldOfXeenCutscenes::worldEnding4() { Common::String gooberStr = Res.GOOBER[_goober]; Common::String congratsStr1 = Common::String::format(Res.WORLD_CONGRATULATIONS, _finalScore); - Common::String congratsStr2 = _goober == NON_GOOBER ? "" : - Common::String::format(Res.WORLD_CONGRATULATIONS2, gooberStr.c_str()); - showPharaohEndText(congratsStr1.c_str(), congratsStr2.c_str()); + showPharaohEndText(congratsStr1.c_str(), + _goober == NON_GOOBER ? nullptr : + Common::String::format(Res.WORLD_CONGRATULATIONS2, gooberStr.c_str()).c_str() + ); } void WorldOfXeenCutscenes::setSubtitle(const Common::String &msg) { |