[Scummvm-git-logs] scummvm master -> 83d9a1f4426d0d6dd0eafcb651697f4d4665c57c

[a-yyg]

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

Summary:
be4b93a9ed SAGA2: Fix global constructor warning in automap.cpp
83d9a1f442 SAGA2: Fix global constructor warnings in main.cpp


Commit: be4b93a9ed48264fcfb6bd045b95e6a1831b5984
    https://github.com/scummvm/scummvm/commit/be4b93a9ed48264fcfb6bd045b95e6a1831b5984
Author: a/ (yuri.kgpps at gmail.com)
Date: 2021-07-19T08:09:02+09:00

Commit Message:
SAGA2: Fix global constructor warning in automap.cpp

Changed paths:
    engines/saga2/automap.cpp


diff --git a/engines/saga2/automap.cpp b/engines/saga2/automap.cpp
index 3b279a4c52..387d8df170 100644
--- a/engines/saga2/automap.cpp
+++ b/engines/saga2/automap.cpp
@@ -120,14 +120,6 @@ static const StaticRect autoMapBotPanelRect = {
 	autoMapBTHeight
 };
 
-
-static const StaticRect *autoMapPanelRects[numAutoMapPanels] = {
-	&autoMapTopPanelRect,
-	&autoMapMidPanelRect,
-	&autoMapBotPanelRect
-};
-
-
 const int16     scrollBtnWidth  = 42;
 const int16     scrollBtnHeight = 42;
 
@@ -143,9 +135,9 @@ static const StaticRect scrollBtnRect = {
 
 
 StaticWindow autoMapDecorations[numAutoMapPanels] = {
-	{*(autoMapPanelRects[0]), NULL, autoMapTopPanelResID},
-	{*(autoMapPanelRects[1]), NULL, autoMapMidPanelResID},
-	{*(autoMapPanelRects[2]), NULL, autoMapBotPanelResID}
+	{autoMapTopPanelRect, NULL, autoMapTopPanelResID},
+	{autoMapMidPanelRect, NULL, autoMapMidPanelResID},
+	{autoMapBotPanelRect, NULL, autoMapBotPanelResID}
 };
 
 


Commit: 83d9a1f4426d0d6dd0eafcb651697f4d4665c57c
    https://github.com/scummvm/scummvm/commit/83d9a1f4426d0d6dd0eafcb651697f4d4665c57c
Author: a/ (yuri.kgpps at gmail.com)
Date: 2021-07-19T08:31:05+09:00

Commit Message:
SAGA2: Fix global constructor warnings in main.cpp

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


diff --git a/engines/saga2/main.cpp b/engines/saga2/main.cpp
index 257ab46932..e5f40a0a0c 100644
--- a/engines/saga2/main.cpp
+++ b/engines/saga2/main.cpp
@@ -128,10 +128,6 @@ static pMessager Status2[10];
 
 pMessager ratemess[3];
 
-frameSmoother frate(frameRate, TICKSPERSECOND, gameTime);
-frameCounter lrate(TICKSPERSECOND, gameTime);
-frameCounter irate(TICKSPERSECOND, gameTime);
-
 /* ===================================================================== *
    Prototypes
  * ===================================================================== */
@@ -233,6 +229,9 @@ static void mainLoop(bool &cleanExit_, int argc, char *argv[]) {
 // Game setup function
 
 bool setupGame(void) {
+	g_vm->_frate = new frameSmoother(frameRate, TICKSPERSECOND, gameTime);
+	g_vm->_lrate = new frameCounter(TICKSPERSECOND, gameTime);
+
 	return programInit();
 }
 
@@ -240,6 +239,9 @@ bool setupGame(void) {
 // Game cleanup function
 
 void cleanupGame(void) {
+	delete g_vm->_frate;
+	delete g_vm->_lrate;
+
 	programTerm();
 }
 
@@ -269,7 +271,6 @@ void dumpGBASE(char *msg);
 void processEventLoop(bool updateScreen) {
 
 	debugC(1, kDebugEventLoop, "EventLoop: starting event loop");
-	irate.updateFrameCount();
 
 	if (checkExit && verifyUserExit()) {
 		//gameRunning=false;
@@ -330,7 +331,7 @@ void displayUpdate(void) {
 		dayNightUpdate();
 		//debugC(1, kDebugEventLoop, "EventLoop: Game mode handle task");
 		GameMode::modeStackPtr[GameMode::modeStackCtr - 1]->handleTask();
-		lrate.updateFrameCount();
+		g_vm->_lrate->updateFrameCount();
 		loops++;
 		elapsed += (gameTime - lastGameTime);
 		lastGameTime = gameTime;
@@ -765,12 +766,12 @@ void WriteStatusF2(int16, const char *, ...) {}
 
 int32 currentGamePerformance(void) {
 	int32 framePer = 100;
-	int32 lval = int(lrate.frameStat());
-	int32 fval = int(lrate.frameStat(grFramesPerSecond));
+	int32 lval = int(g_vm->_lrate->frameStat());
+	int32 fval = int(g_vm->_lrate->frameStat(grFramesPerSecond));
 	if (fval >= frameRate && lval > fval) {
 		framePer += (50 * ((lval - fval) / fval));
 	} else {
-		framePer = (100 * frate.frameStat(grFramesPerSecond)) / frameRate;
+		framePer = (100 * g_vm->_frate->frameStat(grFramesPerSecond)) / frameRate;
 	}
 	framePer = clamp(10, framePer, 240);
 	return framePer;
@@ -778,7 +779,7 @@ int32 currentGamePerformance(void) {
 
 
 void updateFrameCount(void) {
-	frate.updateFrameCount();
+	g_vm->_frate->updateFrameCount();
 }
 
 int32 eloopsPerSecond = 0;
diff --git a/engines/saga2/saga2.cpp b/engines/saga2/saga2.cpp
index bb5c8c7c3f..22dbe84429 100644
--- a/engines/saga2/saga2.cpp
+++ b/engines/saga2/saga2.cpp
@@ -96,6 +96,8 @@ Saga2Engine::Saga2Engine(OSystem *syst)
 	_tileImageBanks = nullptr;
 	_stackList = nullptr;
 	_taskList = nullptr;
+	_frate = nullptr;
+	_lrate = nullptr;
 }
 
 Saga2Engine::~Saga2Engine() {
diff --git a/engines/saga2/saga2.h b/engines/saga2/saga2.h
index c79a413cbb..5f48b3806a 100644
--- a/engines/saga2/saga2.h
+++ b/engines/saga2/saga2.h
@@ -73,6 +73,8 @@ class TileActivityTaskList;
 class TaskStackList;
 class TaskList;
 class Deejay;
+class frameSmoother;
+class frameCounter;
 
 enum {
 	kDebugResources = 1 << 0,
@@ -160,7 +162,8 @@ public:
 	TaskStackList *_stackList;
 	TaskList *_taskList;
 	Deejay *_grandMasterFTA;
-
+	frameSmoother *_frate;
+	frameCounter *_lrate;
 
 	gDisplayPort _mainPort;
 	gPort _backPort;