[Scummvm-git-logs] scummvm master -> 9cb3c333cc9352549d034aaf0e965949c90070ee

[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:
9cb3c333cc SCUMM: HE: Check for _logicHE being initialized


Commit: 9cb3c333cc9352549d034aaf0e965949c90070ee
    https://github.com/scummvm/scummvm/commit/9cb3c333cc9352549d034aaf0e965949c90070ee
Author: AndywinXp (andywinxp at gmail.com)
Date: 2024-11-07T21:26:06+01:00

Commit Message:
SCUMM: HE: Check for _logicHE being initialized

This fixes a small part of Baseball97 (Steam Version)
crashing. (Ticket #15412).

Changed paths:
    engines/scumm/he/script_v90he.cpp


diff --git a/engines/scumm/he/script_v90he.cpp b/engines/scumm/he/script_v90he.cpp
index 8cafde5677d..03a05c4f274 100644
--- a/engines/scumm/he/script_v90he.cpp
+++ b/engines/scumm/he/script_v90he.cpp
@@ -2418,7 +2418,10 @@ void ScummEngine_v90he::o90_kernelGetFunctions() {
 		push(tmp);
 		break;
 	case 2001:
-		push(_logicHE->dispatch(args[1], num - 2, (int32 *)&args[2]));
+		if (_logicHE)
+			push(_logicHE->dispatch(args[1], num - 2, (int32 *)&args[2]));
+		else
+			push(0);
 		break;
 	default:
 		error("o90_kernelGetFunctions: default case %d", args[0]);
@@ -2482,7 +2485,8 @@ void ScummEngine_v90he::o90_kernelSetFunctions() {
 		a->_heCondMask ^= tmp;
 		break;
 	case 2001:
-		_logicHE->dispatch(args[1], num - 2, (int32 *)&args[2]);
+		if (_logicHE)
+			_logicHE->dispatch(args[1], num - 2, (int32 *)&args[2]);
 		break;
 	case 201102: // Used in puttzoo iOS
 	case 20111014: // Used in spyfox iOS