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

[dckone]

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

Summary:
edd20d4196 ALG: bugfix for unregisterScriptFunctions


Commit: edd20d41966a80095be19358aab57b845f5c02cc
    https://github.com/scummvm/scummvm/commit/edd20d41966a80095be19358aab57b845f5c02cc
Author: loki (loki at localhost)
Date: 2026-03-02T22:54:09+08:00

Commit Message:
ALG: bugfix for unregisterScriptFunctions

Changed paths:
    engines/alg/logic/game_bountyhunter.cpp
    engines/alg/logic/game_crimepatrol.cpp
    engines/alg/logic/game_drugwars.cpp
    engines/alg/logic/game_johnnyrock.cpp
    engines/alg/logic/game_maddog.cpp
    engines/alg/logic/game_maddog2.cpp
    engines/alg/logic/game_spacepirates.cpp


diff --git a/engines/alg/logic/game_bountyhunter.cpp b/engines/alg/logic/game_bountyhunter.cpp
index f456597d9b5..ade8ae4b18b 100644
--- a/engines/alg/logic/game_bountyhunter.cpp
+++ b/engines/alg/logic/game_bountyhunter.cpp
@@ -331,29 +331,29 @@ void GameBountyHunter::verifyScriptFunctions() {
 }
 
 void GameBountyHunter::unregisterScriptFunctions() {
-	for (auto func : _rectHitFuncs) {
-		delete &func;
+	for (auto &func : _rectHitFuncs) {
+		delete func._value;
 	}
-	for (auto func : _scenePreOps) {
-		delete &func;
+	for (auto &func : _scenePreOps) {
+		delete func._value;
 	}
-	for (auto func : _sceneShowMsg) {
-		delete &func;
+	for (auto &func : _sceneShowMsg) {
+		delete func._value;
 	}
-	for (auto func : _sceneInsOps) {
-		delete &func;
+	for (auto &func : _sceneInsOps) {
+		delete func._value;
 	}
-	for (auto func : _sceneWepDwn) {
-		delete &func;
+	for (auto &func : _sceneWepDwn) {
+		delete func._value;
 	}
-	for (auto func : _sceneScnScr) {
-		delete &func;
+	for (auto &func : _sceneScnScr) {
+		delete func._value;
 	}
-	for (auto func : _sceneNxtFrm) {
-		delete &func;
+	for (auto &func : _sceneNxtFrm) {
+		delete func._value;
 	}
-	for (auto func : _sceneNxtScn) {
-		delete &func;
+	for (auto &func : _sceneNxtScn) {
+		delete func._value;
 	}
 	_rectHitFuncs.clear();
 	_scenePreOps.clear();
diff --git a/engines/alg/logic/game_crimepatrol.cpp b/engines/alg/logic/game_crimepatrol.cpp
index 64453bafe03..5a1ea3e45ca 100644
--- a/engines/alg/logic/game_crimepatrol.cpp
+++ b/engines/alg/logic/game_crimepatrol.cpp
@@ -271,29 +271,29 @@ void GameCrimePatrol::verifyScriptFunctions() {
 }
 
 void GameCrimePatrol::unregisterScriptFunctions() {
-	for (auto func : _rectHitFuncs) {
-		delete &func;
+	for (auto &func : _rectHitFuncs) {
+		delete func._value;
 	}
-	for (auto func : _scenePreOps) {
-		delete &func;
+	for (auto &func : _scenePreOps) {
+		delete func._value;
 	}
-	for (auto func : _sceneShowMsg) {
-		delete &func;
+	for (auto &func : _sceneShowMsg) {
+		delete func._value;
 	}
-	for (auto func : _sceneInsOps) {
-		delete &func;
+	for (auto &func : _sceneInsOps) {
+		delete func._value;
 	}
-	for (auto func : _sceneWepDwn) {
-		delete &func;
+	for (auto &func : _sceneWepDwn) {
+		delete func._value;
 	}
-	for (auto func : _sceneScnScr) {
-		delete &func;
+	for (auto &func : _sceneScnScr) {
+		delete func._value;
 	}
-	for (auto func : _sceneNxtFrm) {
-		delete &func;
+	for (auto &func : _sceneNxtFrm) {
+		delete func._value;
 	}
-	for (auto func : _sceneNxtScn) {
-		delete &func;
+	for (auto &func : _sceneNxtScn) {
+		delete func._value;
 	}
 	_rectHitFuncs.clear();
 	_scenePreOps.clear();
diff --git a/engines/alg/logic/game_drugwars.cpp b/engines/alg/logic/game_drugwars.cpp
index 90fac60880f..1bfdc1ee6d9 100644
--- a/engines/alg/logic/game_drugwars.cpp
+++ b/engines/alg/logic/game_drugwars.cpp
@@ -219,29 +219,29 @@ void GameDrugWars::verifyScriptFunctions() {
 }
 
 void GameDrugWars::unregisterScriptFunctions() {
-	for (auto func : _rectHitFuncs) {
-		delete &func;
+	for (auto &func : _rectHitFuncs) {
+		delete func._value;
 	}
-	for (auto func : _scenePreOps) {
-		delete &func;
+	for (auto &func : _scenePreOps) {
+		delete func._value;
 	}
-	for (auto func : _sceneShowMsg) {
-		delete &func;
+	for (auto &func : _sceneShowMsg) {
+		delete func._value;
 	}
-	for (auto func : _sceneInsOps) {
-		delete &func;
+	for (auto &func : _sceneInsOps) {
+		delete func._value;
 	}
-	for (auto func : _sceneWepDwn) {
-		delete &func;
+	for (auto &func : _sceneWepDwn) {
+		delete func._value;
 	}
-	for (auto func : _sceneScnScr) {
-		delete &func;
+	for (auto &func : _sceneScnScr) {
+		delete func._value;
 	}
-	for (auto func : _sceneNxtFrm) {
-		delete &func;
+	for (auto &func : _sceneNxtFrm) {
+		delete func._value;
 	}
-	for (auto func : _sceneNxtScn) {
-		delete &func;
+	for (auto &func : _sceneNxtScn) {
+		delete func._value;
 	}
 	_rectHitFuncs.clear();
 	_scenePreOps.clear();
diff --git a/engines/alg/logic/game_johnnyrock.cpp b/engines/alg/logic/game_johnnyrock.cpp
index 098dca98b95..aee1435cd51 100644
--- a/engines/alg/logic/game_johnnyrock.cpp
+++ b/engines/alg/logic/game_johnnyrock.cpp
@@ -254,29 +254,29 @@ void GameJohnnyRock::verifyScriptFunctions() {
 }
 
 void GameJohnnyRock::unregisterScriptFunctions() {
-	for (auto func : _rectHitFuncs) {
-		delete &func;
+	for (auto &func : _rectHitFuncs) {
+		delete func._value;
 	}
-	for (auto func : _scenePreOps) {
-		delete &func;
+	for (auto &func : _scenePreOps) {
+		delete func._value;
 	}
-	for (auto func : _sceneShowMsg) {
-		delete &func;
+	for (auto &func : _sceneShowMsg) {
+		delete func._value;
 	}
-	for (auto func : _sceneInsOps) {
-		delete &func;
+	for (auto &func : _sceneInsOps) {
+		delete func._value;
 	}
-	for (auto func : _sceneWepDwn) {
-		delete &func;
+	for (auto &func : _sceneWepDwn) {
+		delete func._value;
 	}
-	for (auto func : _sceneScnScr) {
-		delete &func;
+	for (auto &func : _sceneScnScr) {
+		delete func._value;
 	}
-	for (auto func : _sceneNxtFrm) {
-		delete &func;
+	for (auto &func : _sceneNxtFrm) {
+		delete func._value;
 	}
-	for (auto func : _sceneNxtScn) {
-		delete &func;
+	for (auto &func : _sceneNxtScn) {
+		delete func._value;
 	}
 	_rectHitFuncs.clear();
 	_scenePreOps.clear();
diff --git a/engines/alg/logic/game_maddog.cpp b/engines/alg/logic/game_maddog.cpp
index 2fab54649a6..6512e25ce73 100644
--- a/engines/alg/logic/game_maddog.cpp
+++ b/engines/alg/logic/game_maddog.cpp
@@ -277,29 +277,29 @@ void GameMaddog::verifyScriptFunctions() {
 }
 
 void GameMaddog::unregisterScriptFunctions() {
-	for (auto func : _rectHitFuncs) {
-		delete &func;
+	for (auto &func : _rectHitFuncs) {
+		delete func._value;
 	}
-	for (auto func : _scenePreOps) {
-		delete &func;
+	for (auto &func : _scenePreOps) {
+		delete func._value;
 	}
-	for (auto func : _sceneShowMsg) {
-		delete &func;
+	for (auto &func : _sceneShowMsg) {
+		delete func._value;
 	}
-	for (auto func : _sceneInsOps) {
-		delete &func;
+	for (auto &func : _sceneInsOps) {
+		delete func._value;
 	}
-	for (auto func : _sceneWepDwn) {
-		delete &func;
+	for (auto &func : _sceneWepDwn) {
+		delete func._value;
 	}
-	for (auto func : _sceneScnScr) {
-		delete &func;
+	for (auto &func : _sceneScnScr) {
+		delete func._value;
 	}
-	for (auto func : _sceneNxtFrm) {
-		delete &func;
+	for (auto &func : _sceneNxtFrm) {
+		delete func._value;
 	}
-	for (auto func : _sceneNxtScn) {
-		delete &func;
+	for (auto &func : _sceneNxtScn) {
+		delete func._value;
 	}
 	_rectHitFuncs.clear();
 	_scenePreOps.clear();
diff --git a/engines/alg/logic/game_maddog2.cpp b/engines/alg/logic/game_maddog2.cpp
index 9a99b019bca..a810a090af7 100644
--- a/engines/alg/logic/game_maddog2.cpp
+++ b/engines/alg/logic/game_maddog2.cpp
@@ -288,29 +288,29 @@ void GameMaddog2::verifyScriptFunctions() {
 }
 
 void GameMaddog2::unregisterScriptFunctions() {
-	for (auto func : _rectHitFuncs) {
-		delete &func;
+	for (auto &func : _rectHitFuncs) {
+		delete func._value;
 	}
-	for (auto func : _scenePreOps) {
-		delete &func;
+	for (auto &func : _scenePreOps) {
+		delete func._value;
 	}
-	for (auto func : _sceneShowMsg) {
-		delete &func;
+	for (auto &func : _sceneShowMsg) {
+		delete func._value;
 	}
-	for (auto func : _sceneInsOps) {
-		delete &func;
+	for (auto &func : _sceneInsOps) {
+		delete func._value;
 	}
-	for (auto func : _sceneWepDwn) {
-		delete &func;
+	for (auto &func : _sceneWepDwn) {
+		delete func._value;
 	}
-	for (auto func : _sceneScnScr) {
-		delete &func;
+	for (auto &func : _sceneScnScr) {
+		delete func._value;
 	}
-	for (auto func : _sceneNxtFrm) {
-		delete &func;
+	for (auto &func : _sceneNxtFrm) {
+		delete func._value;
 	}
-	for (auto func : _sceneNxtScn) {
-		delete &func;
+	for (auto &func : _sceneNxtScn) {
+		delete func._value;
 	}
 	_rectHitFuncs.clear();
 	_scenePreOps.clear();
diff --git a/engines/alg/logic/game_spacepirates.cpp b/engines/alg/logic/game_spacepirates.cpp
index 69171296727..b4a3d40b4f6 100644
--- a/engines/alg/logic/game_spacepirates.cpp
+++ b/engines/alg/logic/game_spacepirates.cpp
@@ -288,29 +288,29 @@ void GameSpacePirates::verifyScriptFunctions() {
 }
 
 void GameSpacePirates::unregisterScriptFunctions() {
-	for (auto func : _rectHitFuncs) {
-		delete &func;
+	for (auto &func : _rectHitFuncs) {
+		delete func._value;
 	}
-	for (auto func : _scenePreOps) {
-		delete &func;
+	for (auto &func : _scenePreOps) {
+		delete func._value;
 	}
-	for (auto func : _sceneShowMsg) {
-		delete &func;
+	for (auto &func : _sceneShowMsg) {
+		delete func._value;
 	}
-	for (auto func : _sceneInsOps) {
-		delete &func;
+	for (auto &func : _sceneInsOps) {
+		delete func._value;
 	}
-	for (auto func : _sceneWepDwn) {
-		delete &func;
+	for (auto &func : _sceneWepDwn) {
+		delete func._value;
 	}
-	for (auto func : _sceneScnScr) {
-		delete &func;
+	for (auto &func : _sceneScnScr) {
+		delete func._value;
 	}
-	for (auto func : _sceneNxtFrm) {
-		delete &func;
+	for (auto &func : _sceneNxtFrm) {
+		delete func._value;
 	}
-	for (auto func : _sceneNxtScn) {
-		delete &func;
+	for (auto &func : _sceneNxtScn) {
+		delete func._value;
 	}
 	_rectHitFuncs.clear();
 	_scenePreOps.clear();