[Scummvm-git-logs] scummvm master -> 16f1f529742fd7c7f2934684773f29cb86df7f6a

[AndywinXp]

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:
16f1f52974 SCUMM: HE: Relabel some HE72 scripts magic numbers


Commit: 16f1f529742fd7c7f2934684773f29cb86df7f6a
    https://github.com/scummvm/scummvm/commit/16f1f529742fd7c7f2934684773f29cb86df7f6a
Author: AndywinXp (andywinxp at gmail.com)
Date: 2024-07-08T22:13:57+02:00

Commit Message:
SCUMM: HE: Relabel some HE72 scripts magic numbers

Changed paths:
    engines/scumm/he/intern_he.h
    engines/scumm/he/script_v72he.cpp


diff --git a/engines/scumm/he/intern_he.h b/engines/scumm/he/intern_he.h
index 0dddfd84cb1..e08f66afee2 100644
--- a/engines/scumm/he/intern_he.h
+++ b/engines/scumm/he/intern_he.h
@@ -379,6 +379,9 @@ protected:
 		SO_RANGE_ARRAY_ASSIGNMENT = 128,
 		SO_COMPLEX_ARRAY_MATH_OPERATION = 138,
 		SO_FORMATTED_STRING = 194,
+		SO_REC = 195,
+		SO_BAK = 199,
+		SO_BAKREC = 200,
 		SO_UNDIM_ARRAY = 204,
 	};
 
@@ -646,11 +649,8 @@ protected:
 		SO_FONT_RENDER = 143,
 		SO_CLOSE = 165,
 		SO_RENDER_ELLIPSE = 189,
-		SO_REC = 195,
 		SO_FONT_END = 196,
-		SO_ACTOR_VARIABLE = 198,
-		SO_BAK = 199,
-		SO_BAKREC = 200
+		SO_ACTOR_VARIABLE = 198
 	};
 
 	struct VideoParameters {
diff --git a/engines/scumm/he/script_v72he.cpp b/engines/scumm/he/script_v72he.cpp
index d43ffa78039..45ac351e0ba 100644
--- a/engines/scumm/he/script_v72he.cpp
+++ b/engines/scumm/he/script_v72he.cpp
@@ -638,7 +638,7 @@ void ScummEngine_v72he::o72_startScript() {
 			return;
 	}
 
-	runScript(script, (flags == 199 || flags == 200), (flags == 195 || flags == 200), args);
+	runScript(script, (flags == SO_BAK || flags == SO_BAKREC), (flags == SO_REC || flags == SO_BAKREC), args);
 }
 
 void ScummEngine_v72he::o72_startObject() {
@@ -650,7 +650,7 @@ void ScummEngine_v72he::o72_startObject() {
 	entryp = pop();
 	script = pop();
 	flags = fetchScriptByte();
-	runObjectScript(script, entryp, (flags == 199 || flags == 200), (flags == 195 || flags == 200), args);
+	runObjectScript(script, entryp, (flags == SO_BAK || flags == SO_BAKREC), (flags == SO_REC || flags == SO_BAKREC), args);
 }
 
 void ScummEngine_v72he::o72_drawObject() {
@@ -1645,7 +1645,7 @@ void ScummEngine_v72he::o72_jumpToScript() {
 	script = pop();
 	flags = fetchScriptByte();
 	stopObjectCode();
-	runScript(script, (flags == 199 || flags == 200), (flags == 195 || flags == 200), args);
+	runScript(script, (flags == SO_BAK || flags == SO_BAKREC), (flags == SO_REC || flags == SO_BAKREC), args);
 }
 
 void ScummEngine_v72he::o72_openFile() {