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

[a-yyg]

This automated email contains information about 3 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
7e9dcc3bda SAGA2: Update screen when updating palette
9a386e0b72 SAGA2: Fix SensorList erase in addSensor
fcf56cae45 SAGA2: Fix fade in load from launcher


Commit: 7e9dcc3bda47dae7057b457a7c1f894dde542f41
    https://github.com/scummvm/scummvm/commit/7e9dcc3bda47dae7057b457a7c1f894dde542f41
Author: a/ (yuri.kgpps at gmail.com)
Date: 2021-07-22T00:22:32+09:00

Commit Message:
SAGA2: Update screen when updating palette

Changed paths:
    engines/saga2/vpal.cpp


diff --git a/engines/saga2/vpal.cpp b/engines/saga2/vpal.cpp
index 4e503fbc2a..eb09f05348 100644
--- a/engines/saga2/vpal.cpp
+++ b/engines/saga2/vpal.cpp
@@ -228,6 +228,7 @@ bool updatePalette() {
 			memcpy(&currentPalette, &tempPalette, sizeof(gPalette));
 			assertCurrentPalette();
 
+			g_system->updateScreen();
 		}
 		return true;
 	}


Commit: 9a386e0b72c434ae719e68becbda81bb712d117b
    https://github.com/scummvm/scummvm/commit/9a386e0b72c434ae719e68becbda81bb712d117b
Author: a/ (yuri.kgpps at gmail.com)
Date: 2021-07-22T00:22:32+09:00

Commit Message:
SAGA2: Fix SensorList erase in addSensor

Changed paths:
    engines/saga2/objects.cpp


diff --git a/engines/saga2/objects.cpp b/engines/saga2/objects.cpp
index 5040745a38..790ce7dd21 100644
--- a/engines/saga2/objects.cpp
+++ b/engines/saga2/objects.cpp
@@ -1929,8 +1929,8 @@ bool GameObject::addSensor(Sensor *newSensor) {
 		assert((*it)->getObject() == this);
 
 		if (newSensor->thisID() == (*it)->thisID()) {
-			sensorList->_list.remove(*it);
 			delete *it;
+			it = sensorList->_list.erase(it);
 
 			break;
 		}


Commit: fcf56cae45244e0d53f5870437439f4fdf6d22be
    https://github.com/scummvm/scummvm/commit/fcf56cae45244e0d53f5870437439f4fdf6d22be
Author: a/ (yuri.kgpps at gmail.com)
Date: 2021-07-22T00:22:32+09:00

Commit Message:
SAGA2: Fix fade in load from launcher

Changed paths:
    engines/saga2/display.cpp
    engines/saga2/main.cpp


diff --git a/engines/saga2/display.cpp b/engines/saga2/display.cpp
index b2681ab336..389bc39de1 100644
--- a/engines/saga2/display.cpp
+++ b/engines/saga2/display.cpp
@@ -24,6 +24,8 @@
  *   (c) 1993-1996 The Wyrmkeep Entertainment Co.
  */
 
+#include "common/config-manager.h"
+
 #include "saga2/saga2.h"
 #include "saga2/display.h"
 #include "saga2/intrface.h"
@@ -87,6 +89,15 @@ void displayUpdate(void);
 void drawMainDisplay(void);
 
 void niceScreenStartup(void) {
+	if (ConfMan.hasKey("save_slot")) {
+		cleanupGameState();
+		loadSavedGameState(ConfMan.getInt("save_slot"));
+
+		if (GameMode::newmodeFlag)
+			GameMode::update();
+		updateActiveRegions();
+	}
+
 	blackOut();
 	disablePaletteChanges();
 	mainEnable();
diff --git a/engines/saga2/main.cpp b/engines/saga2/main.cpp
index d63f492d7d..94a4f12848 100644
--- a/engines/saga2/main.cpp
+++ b/engines/saga2/main.cpp
@@ -24,7 +24,6 @@
  *   (c) 1993-1996 The Wyrmkeep Entertainment Co.
  */
 
-#include "common/config-manager.h"
 #include "common/debug.h"
 #include "common/events.h"
 #include "common/memstream.h"
@@ -191,31 +190,8 @@ void main_saga2() {
 	gameInitialized = initializeGame();
 	cleanExit = gameInitialized;
 
-	if (gameInitialized) {
-		if (ConfMan.hasKey("save_slot")) {
-			reDrawScreen();
-
-			disableUserControls();
-			cleanupGameState();
-
-			fadeDown();
-
-			loadSavedGameState(ConfMan.getInt("save_slot"));
-
-			if (GameMode::newmodeFlag)
-				GameMode::update();
-			updateActiveRegions();
-			enableUserControls();
-			updateMainDisplay();
-			drawMainDisplay();
-			enablePaletteChanges();
-			updateAllUserControls();
-			fadeUp();
-			reDrawScreen();
-		}
-
+	if (gameInitialized)
 		mainLoop(cleanExit, 0, NULL);
-	}
 
 	shutdownGame();
 	gameInitialized = false;