diff options
author | Adrian Frühwirth | 2018-05-20 22:36:40 +0200 |
---|---|---|
committer | Adrian Frühwirth | 2018-05-20 23:40:20 +0200 |
commit | c7f3416daa0238bb60e83a6d6d665a7f3a7e6d6c (patch) | |
tree | ed7b352caca6c4410c01b8eda21c58156bacdca8 /engines/xeen/worldofxeen | |
parent | 5dda21c1c2552945a9446ee24ec6692734a0332a (diff) | |
download | scummvm-rg350-c7f3416daa0238bb60e83a6d6d665a7f3a7e6d6c.tar.gz scummvm-rg350-c7f3416daa0238bb60e83a6d6d665a7f3a7e6d6c.tar.bz2 scummvm-rg350-c7f3416daa0238bb60e83a6d6d665a7f3a7e6d6c.zip |
JANITORIAL: Remove trailing whitespace
Diffstat (limited to 'engines/xeen/worldofxeen')
-rw-r--r-- | engines/xeen/worldofxeen/clouds_cutscenes.cpp | 6 | ||||
-rw-r--r-- | engines/xeen/worldofxeen/darkside_cutscenes.cpp | 6 | ||||
-rw-r--r-- | engines/xeen/worldofxeen/worldofxeen_menu.cpp | 8 |
3 files changed, 10 insertions, 10 deletions
diff --git a/engines/xeen/worldofxeen/clouds_cutscenes.cpp b/engines/xeen/worldofxeen/clouds_cutscenes.cpp index 43164a1ce9..dd87f5807a 100644 --- a/engines/xeen/worldofxeen/clouds_cutscenes.cpp +++ b/engines/xeen/worldofxeen/clouds_cutscenes.cpp @@ -278,7 +278,7 @@ bool CloudsCutscenes::showCloudsIntroInner() { sound.playVoice(_INTRO_VOCS[lineCtr]); } - for (int frameCtr = 0, lookup = 0; sound.isSoundPlaying() || + for (int frameCtr = 0, lookup = 0; sound.isSoundPlaying() || (_subtitles.active() && (lineCtr == 0 || lineCtr == 4 || lineCtr == 10 || lineCtr == 13)); ) { groupo.draw(0, 0); groupo.draw(0, 1, Common::Point(160, 0)); @@ -332,7 +332,7 @@ bool CloudsCutscenes::showCloudsIntroInner() { windows[0].writeString(Res.CLOUDS_INTRO1); ctr5 = (ctr5 + 1) % 19; - + WAIT(1); continue; } @@ -985,7 +985,7 @@ bool CloudsCutscenes::showCloudsEnding5() { king.draw(0, 1, Common::Point(160, 0)); screen.fadeIn(); _subtitles.setLine(13); - + sound.playVoice("king4.voc"); do { king.draw(0, 0, Common::Point(0, 0)); diff --git a/engines/xeen/worldofxeen/darkside_cutscenes.cpp b/engines/xeen/worldofxeen/darkside_cutscenes.cpp index ef5c1df157..db9254f067 100644 --- a/engines/xeen/worldofxeen/darkside_cutscenes.cpp +++ b/engines/xeen/worldofxeen/darkside_cutscenes.cpp @@ -104,7 +104,7 @@ bool DarkSideCutscenes::showDarkSideTitle(bool seenIntro) { // Render the next frame screen.vertMerge(0); nwc[nwcIndex].draw(0, nwcFrame); - + switch (idx) { case 17: sound.playSound(voc[0]); @@ -128,7 +128,7 @@ bool DarkSideCutscenes::showDarkSideTitle(bool seenIntro) { for (int idx = 0; idx < 42 && !g_vm->shouldExit(); ++idx) { screen.vertMerge(SCREEN_HEIGHT); nwc[3].draw(0, idx); - + switch (idx) { case 3: sound.playFX(40); @@ -808,7 +808,7 @@ bool DarkSideCutscenes::showWorldOfXeenLogo() { for (int idx = 0; idx < 21; ++idx) { screen.restoreBackground(); wfire[6].draw(0, idx, Common::Point(0, 45)); - + switch (idx) { case 0: case 11: diff --git a/engines/xeen/worldofxeen/worldofxeen_menu.cpp b/engines/xeen/worldofxeen/worldofxeen_menu.cpp index 5beff45337..6d80e62806 100644 --- a/engines/xeen/worldofxeen/worldofxeen_menu.cpp +++ b/engines/xeen/worldofxeen/worldofxeen_menu.cpp @@ -57,7 +57,7 @@ void MainMenuContainer::show() { MainMenuContainer::MainMenuContainer(const char *spritesName1, const char *spritesName2, const char *spritesName3) : _animateCtr(0), _dialog(nullptr) { g_vm->_files->setGameCc(g_vm->getGameID() == GType_Clouds ? 0 : 1); - + _backgroundSprites.resize(1 + (spritesName2 ? 1 : 0) + (spritesName3 ? 1 : 0)); _backgroundSprites[0].load(spritesName1); if (spritesName2) @@ -120,7 +120,7 @@ void MainMenuContainer::execute() { // Check for events events.updateGameCounter(); - + if (events.wait(4, true)) { if (_dialog) { // There's a dialog active, so let it handle the event @@ -337,7 +337,7 @@ void CloudsMenuDialog::loadButtons() { void CloudsMenuDialog::draw() { Windows &windows = *g_vm->_windows; Window &w = windows[GAME_WINDOW]; - + w.frame(); w.writeString(Common::String::format(Res.OPTIONS_MENU, Res.GAME_NAMES[0], g_vm->_gameWon[0] ? 117 : 92, 1992)); drawButtons(&w); @@ -584,7 +584,7 @@ void OtherOptionsDialog::draw() { w.frame(); w.writeString(Common::String::format(Res.OPTIONS_MENU, - Res.GAME_NAMES[g_vm->getGameID() == GType_WorldOfXeen ? 2 : 1], + Res.GAME_NAMES[g_vm->getGameID() == GType_WorldOfXeen ? 2 : 1], w.getBounds().height() - 33, 1993)); drawButtons(&w); } |