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

sev- noreply at scummvm.org
Sat Oct 19 20:05:35 UTC 2024


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:
bb4a17abd0 QDENGINE: Fix compilation


Commit: bb4a17abd0e26b6ff7b52217d39026661357e3e9
    https://github.com/scummvm/scummvm/commit/bb4a17abd0e26b6ff7b52217d39026661357e3e9
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2024-10-19T22:05:17+02:00

Commit Message:
QDENGINE: Fix compilation

Changed paths:
    engines/qdengine/minigames/adv/RunTime.cpp


diff --git a/engines/qdengine/minigames/adv/RunTime.cpp b/engines/qdengine/minigames/adv/RunTime.cpp
index 490c1156723..e8831480a94 100644
--- a/engines/qdengine/minigames/adv/RunTime.cpp
+++ b/engines/qdengine/minigames/adv/RunTime.cpp
@@ -111,10 +111,10 @@ MinigameManager::~MinigameManager() {
 bool MinigameManager::init(const qdEngineInterface *engine_interface) {
 	debugC(1, kDebugMinigames, "MinigameManager::init(): init game");
 
-	if (runtime != this)
+	if (g_runtime != this)
 		warning("MinigameManager::init(): Attempt to instantiate double minigame");
 
-	if (runtime != this)
+	if (g_runtime != this)
 		return false;
 	assert(!engine_ && !scene_);
 
@@ -336,8 +336,8 @@ class TempValue {
 public:
 	TempValue(MinigameManager *new_runtime, const qdEngineInterface *new_engine, qdMinigameSceneInterface *new_scene) {
 		assert(new_runtime);
-		pre_runtime_ = runtime;
-		runtime = new_runtime;
+		pre_runtime_ = g_runtime;
+		g_runtime = new_runtime;
 
 		assert(new_engine && new_scene);
 		pre_engine_ = g_runtime->engine_;
@@ -350,7 +350,7 @@ public:
 		g_runtime->engine_ = pre_engine_;
 		g_runtime->scene_ = pre_scene_;
 
-		runtime = pre_runtime_;
+		g_runtime = pre_runtime_;
 	}
 };
 




More information about the Scummvm-git-logs mailing list