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

[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:
e6bb527771 SAGA2: Remove globals/static variables in transit.cpp


Commit: e6bb5277719440ac0f2b01c2c3aa451f8f609987
    https://github.com/scummvm/scummvm/commit/e6bb5277719440ac0f2b01c2c3aa451f8f609987
Author: a/ (yuri.kgpps at gmail.com)
Date: 2021-08-23T06:16:52+09:00

Commit Message:
SAGA2: Remove globals/static variables in transit.cpp

Changed paths:
    engines/saga2/transit.cpp
    engines/saga2/vpal.cpp
    engines/saga2/vpal.h


diff --git a/engines/saga2/transit.cpp b/engines/saga2/transit.cpp
index 188a37a9c1..b556b038a1 100644
--- a/engines/saga2/transit.cpp
+++ b/engines/saga2/transit.cpp
@@ -37,12 +37,6 @@ namespace Saga2 {
 
 extern  int16               currentMapNum;          // which map is in use
 
-/* ===================================================================== *
-   Globals
- * ===================================================================== */
-
-static gPalette     newPalette;
-
 /* ===================================================================== *
    Prototypes
  * ===================================================================== */
@@ -71,30 +65,28 @@ void dayNightUpdate(void) {
 
 	audioEnvironmentSetDaytime(isDayTime());
 
-
-	static uint32   prevLightLevel = 0;
-	uint32          lightLevel = calender.lightLevel(MAX_LIGHT);
+	uint32 lightLevel = calender.lightLevel(MAX_LIGHT);
 
 	//  Code to avoid unneccessary fades.
-	if (lightLevel != prevLightLevel) {
-		prevLightLevel = lightLevel;
+	if (lightLevel != g_vm->_pal->_prevLightLevel) {
+		g_vm->_pal->_prevLightLevel = lightLevel;
 
 		g_vm->_pal->createPalette(
-		    &newPalette,
+		    &g_vm->_pal->_newPalette,
 		    g_vm->_pal->_midnightPalette,
 		    g_vm->_pal->_noonPalette,
 		    lightLevel,
 		    MAX_LIGHT);
 
 		if (currentMapNum == 0)
-			g_vm->_pal->beginFade(&newPalette, 100);
+			g_vm->_pal->beginFade(&g_vm->_pal->_newPalette, 100);
 	}
 
 	if (!g_vm->_pal->updatePalette()) {
 		gPalettePtr     neededPalette;
 		gPalette        currentPalette;
 
-		neededPalette = currentMapNum == 0 ? &newPalette : g_vm->_pal->_noonPalette;
+		neededPalette = currentMapNum == 0 ? &g_vm->_pal->_newPalette : g_vm->_pal->_noonPalette;
 		g_vm->_pal->getCurrentPalette(&currentPalette);
 		if (memcmp(&currentPalette, neededPalette, sizeof(gPalette)) != 0)
 			g_vm->_pal->setCurrentPalette(neededPalette);
@@ -137,7 +129,7 @@ void fadeUp(void) {
 		drawMainDisplay();
 		reDrawScreen();
 		enablePaletteChanges();
-		g_vm->_pal->beginFade(currentMapNum != 0 ? g_vm->_pal->_noonPalette : &newPalette, 20);
+		g_vm->_pal->beginFade(currentMapNum != 0 ? g_vm->_pal->_noonPalette : &g_vm->_pal->_newPalette, 20);
 		while (g_vm->_pal->updatePalette()) ;
 	}
 }
diff --git a/engines/saga2/vpal.cpp b/engines/saga2/vpal.cpp
index ec178b671d..a698ad135b 100644
--- a/engines/saga2/vpal.cpp
+++ b/engines/saga2/vpal.cpp
@@ -55,7 +55,9 @@ PaletteManager::PaletteManager() {
 	_midnightPalette = nullptr;
 	_noonPalette = nullptr;
 	_darkPalette = nullptr;
+	_prevLightLevel = 0;
 
+	memset(_newPalette.entry, 0, sizeof(_newPalette.entry));
 	memset(_currentPalette.entry, 0, sizeof(_currentPalette.entry));
 	memset(_oldPalette.entry, 0, sizeof(_oldPalette.entry));
 	memset(_destPalette.entry, 0, sizeof(_destPalette.entry));
@@ -231,11 +233,11 @@ void PaletteManager::createPalette(
     gPalettePtr srcP,
     gPalettePtr dstP,
     int32       elapsedTime,
-    int32       _totalTime_) {
-	assert(_totalTime_ != 0);
+    int32       totalTime) {
+	assert(totalTime != 0);
 
 	int             i;
-	uint32          fadeProgress = (elapsedTime << 8) / _totalTime_;
+	uint32          fadeProgress = (elapsedTime << 8) / totalTime;
 
 	for (i = 0; i < (long)ARRAYSIZE(newP->entry); i++) {
 		gPaletteEntry   *srcPal = &srcP->entry[i];
diff --git a/engines/saga2/vpal.h b/engines/saga2/vpal.h
index f22776bf48..6332851976 100644
--- a/engines/saga2/vpal.h
+++ b/engines/saga2/vpal.h
@@ -71,10 +71,13 @@ private:
 
 
 public:
+	gPalette _newPalette;
 	gPalettePtr _midnightPalette,
 			    _noonPalette,
 			    _darkPalette;
 
+	uint32 _prevLightLevel;
+
 	PaletteManager();
 	//~PaletteManager() {}