[Scummvm-git-logs] scummvm master -> c5322b246aa7f53464dd56dfea04e9c9f72be1f4

[a-yyg]

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:
c5322b246a SAGA2: Make ending playable


Commit: c5322b246aa7f53464dd56dfea04e9c9f72be1f4
    https://github.com/scummvm/scummvm/commit/c5322b246aa7f53464dd56dfea04e9c9f72be1f4
Author: a/ (yuri.kgpps at gmail.com)
Date: 2021-07-26T01:13:44+09:00

Commit Message:
SAGA2: Make ending playable

Changed paths:
    engines/saga2/tromode.cpp


diff --git a/engines/saga2/tromode.cpp b/engines/saga2/tromode.cpp
index 98dc063651..a7880ef335 100644
--- a/engines/saga2/tromode.cpp
+++ b/engines/saga2/tromode.cpp
@@ -74,10 +74,8 @@ static void TroModeSetup(void);
 static void TroModeCleanup(void);
 
 static bool abortFlag = false;
-#ifndef NO_LOAD_AFTER_WIN
 //DO_OUTRO_IN_CLEANUP
 static int whichOutro = -1;
-#endif
 
 // ------------------------------------------------------------------------
 // Play intro video
@@ -104,19 +102,8 @@ void setOutroMode(void) {
 extern GameWorld            *currentWorld;          // pointer to the current world
 
 void setWintroMode(int16 whichOne) {
-#ifdef NO_LOAD_AFTER_WIN
-	if (!abortFlag) {
-		freeAllTileBanks();
-		currentWorld = NULL;
-		TroModeSetup();
-		doWintro(whichOne);
-		TroModeCleanup();
-	}
-	endGame();
-#else
 	whichOutro = whichOne;
 	allPlayerActorsDead = true;
-#endif
 }
 
 // ------------------------------------------------------------------------
@@ -127,6 +114,7 @@ void fadeUp();
 void dumpGBASE(char *msg);
 
 void setLostroMode(void) {
+	abortFlag = false;
 	allPlayerActorsDead = false;
 	if (GameMode::newmodeFlag)
 		GameMode::update();