[Scummvm-git-logs] scummvm master -> 70375ec29b1f3f22098f8438be394b536c9f513c
dreammaster
dreammaster at scummvm.org
Sat Jan 20 23:32:22 CET 2018
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
70375ec29b XEEN: Break out of gameplay when party is killed
Commit: 70375ec29b1f3f22098f8438be394b536c9f513c
https://github.com/scummvm/scummvm/commit/70375ec29b1f3f22098f8438be394b536c9f513c
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2018-01-20T17:32:10-05:00
Commit Message:
XEEN: Break out of gameplay when party is killed
Changed paths:
engines/xeen/worldofxeen/worldofxeen.cpp
engines/xeen/xeen.cpp
diff --git a/engines/xeen/worldofxeen/worldofxeen.cpp b/engines/xeen/worldofxeen/worldofxeen.cpp
index cc797d7..e67024c 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:
diff --git a/engines/xeen/xeen.cpp b/engines/xeen/xeen.cpp
index 44679ee..1b06883 100644
--- a/engines/xeen/xeen.cpp
+++ b/engines/xeen/xeen.cpp
@@ -225,6 +225,9 @@ void XeenEngine::gameLoop() {
// Main user interface handler for waiting for and processing user input
_interface->perform();
+
+ if (_party->_dead)
+ break;
}
}
More information about the Scummvm-git-logs
mailing list