[Scummvm-git-logs] scummvm master -> 494858d659511ce12c9c4fd94483d41bad16e739

[aquadran]

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:
494858d659 WINTERMUTE: Reworked conditions for W/A


Commit: 494858d659511ce12c9c4fd94483d41bad16e739
    https://github.com/scummvm/scummvm/commit/494858d659511ce12c9c4fd94483d41bad16e739
Author: Paweł Kołodziejski (aquadran at gmail.com)
Date: 2025-07-20T18:56:32+02:00

Commit Message:
WINTERMUTE: Reworked conditions for W/A

Changed paths:
    engines/wintermute/base/scriptables/script.cpp


diff --git a/engines/wintermute/base/scriptables/script.cpp b/engines/wintermute/base/scriptables/script.cpp
index 552f4e9b7ab..765861cb43a 100644
--- a/engines/wintermute/base/scriptables/script.cpp
+++ b/engines/wintermute/base/scriptables/script.cpp
@@ -638,9 +638,9 @@ bool ScScript::executeInstruction() {
 			// W/A: The Sprite class instance is released earlier,
 			// but a native variable still holds a reference to it,
 			// leading to call on a non-existent (freed) instance.
-			if (BaseEngine::instance().getGameId() == "alphapolaris" &&
-			        var->isNative() &&
-					strcmp(methodName, "Reset") == 0 &&
+			if (var->isNative() &&
+			        strcmp(methodName, "Reset") == 0 &&
+			        BaseEngine::instance().getGameId() == "alphapolaris" &&
 			        strcmp(_filename, "scenes\\Out_door\\scr\\barrel.script") == 0) {
 
 				_stack->correctParams(0);