[Scummvm-git-logs] scummvm master -> 6b157da19412c69888a47a3b67d1d8f6cdd70bc2

[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:
6b157da194 SCUMM: HE: Fix crash in FREDDI2 and cleanup


Commit: 6b157da19412c69888a47a3b67d1d8f6cdd70bc2
    https://github.com/scummvm/scummvm/commit/6b157da19412c69888a47a3b67d1d8f6cdd70bc2
Author: AndywinXp (andywinxp at gmail.com)
Date: 2023-03-17T13:10:23+01:00

Commit Message:
SCUMM: HE: Fix crash in FREDDI2 and cleanup

Changed paths:
    engines/scumm/he/script_v60he.cpp
    engines/scumm/he/script_v72he.cpp
    engines/scumm/script_v6.cpp


diff --git a/engines/scumm/he/script_v60he.cpp b/engines/scumm/he/script_v60he.cpp
index cf3b0f1b603..db63bdaac0e 100644
--- a/engines/scumm/he/script_v60he.cpp
+++ b/engines/scumm/he/script_v60he.cpp
@@ -1046,7 +1046,7 @@ void ScummEngine_v60he::o60_seekFilePos() {
 
 	if (slot == -1)
 		return;
-	
+
 	int whence;
 	switch(mode) {
 	case 1:
diff --git a/engines/scumm/he/script_v72he.cpp b/engines/scumm/he/script_v72he.cpp
index e0ae021596c..1ad8be1120f 100644
--- a/engines/scumm/he/script_v72he.cpp
+++ b/engines/scumm/he/script_v72he.cpp
@@ -585,7 +585,7 @@ void ScummEngine_v72he::o72_drawObject() {
 			state = 1;
 		y = x = -100;
 		break;
-	case SO_AT:
+	case ScummEngine_v6::SubOpType::SO_AT:
 		state = 1;
 		y = pop();
 		x = pop();
@@ -1262,7 +1262,7 @@ void ScummEngine_v72he::o72_arrayOps() {
 				}
 				break;
 			}
-	case 194:		// SO_FORMATTED_STRING
+	case SO_FORMATTED_STRING: // SO_FORMATTED_STRING
 		decodeScriptString(string);
 		len = resStrLen(string);
 		data = defineArray(array, kStringArray, 0, 0, 0, len);
diff --git a/engines/scumm/script_v6.cpp b/engines/scumm/script_v6.cpp
index ab96a13f016..7a6ee4d4964 100644
--- a/engines/scumm/script_v6.cpp
+++ b/engines/scumm/script_v6.cpp
@@ -2052,7 +2052,7 @@ void ScummEngine_v6::o6_actorOps() {
 	case SO_ACTOR_TURN:										/* turn to direction */
 		a->turnToDirection(pop());
 		break;
-	case SO_ACTOR_WALK_PAUSE: 
+	case SO_ACTOR_WALK_PAUSE:
 		a->_moving |= MF_FROZEN;
 		break;
 	case SO_ACTOR_WALK_RESUME: