diff options
| author | Paul Gilbert | 2018-01-20 17:32:10 -0500 |
|---|---|---|
| committer | Paul Gilbert | 2018-01-20 17:32:10 -0500 |
| commit | 70375ec29b1f3f22098f8438be394b536c9f513c (patch) | |
| tree | 32b8ba74080dd9c229bc87d025e723c33ed28824 /engines/xeen/worldofxeen/worldofxeen.cpp | |
| parent | ce400ce0f1764c3ee5a5dc102e84d372c8cd57ee (diff) | |
| download | scummvm-rg350-70375ec29b1f3f22098f8438be394b536c9f513c.tar.gz scummvm-rg350-70375ec29b1f3f22098f8438be394b536c9f513c.tar.bz2 scummvm-rg350-70375ec29b1f3f22098f8438be394b536c9f513c.zip | |
XEEN: Break out of gameplay when party is killed
Diffstat (limited to 'engines/xeen/worldofxeen/worldofxeen.cpp')
| -rw-r--r-- | engines/xeen/worldofxeen/worldofxeen.cpp | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/engines/xeen/worldofxeen/worldofxeen.cpp b/engines/xeen/worldofxeen/worldofxeen.cpp index cc797d77ff..e67024c883 100644 --- a/engines/xeen/worldofxeen/worldofxeen.cpp +++ b/engines/xeen/worldofxeen/worldofxeen.cpp @@ -40,32 +40,31 @@ void WorldOfXeenEngine::outerGameLoop() { //_pendingAction = getGameID() == GType_DarkSide ? WOX_DARKSIDE_INTRO : WOX_CLOUDS_INTRO; _pendingAction = WOX_MENU; - if (_loadSaveSlot != -1 || gDebugLevel >= 1) - // Skip main menu and go straight to the game + if (_loadSaveSlot != -1) + // Loading savegame from launcher, so Skip menu and go straight to game _pendingAction = WOX_PLAY_GAME; while (!shouldQuit() && _pendingAction != WOX_QUIT) { - switch (_pendingAction) { + WOXGameAction action = _pendingAction; + _pendingAction = WOX_MENU; + + switch (action) { case WOX_CLOUDS_INTRO: if (showCloudsTitle()) showCloudsIntro(); - _pendingAction = WOX_MENU; break; case WOX_CLOUDS_ENDING: showCloudsEnding(); - _pendingAction = WOX_MENU; break; case WOX_DARKSIDE_INTRO: if (showDarkSideTitle()) showDarkSideIntro(); - _pendingAction = WOX_MENU; break; case WOX_DARKSIDE_ENDING: showDarkSideEnding(); - _pendingAction = WOX_MENU; break; case WOX_WORLD_ENDING: |