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

[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:
f8f6729caa SCUMM: MANIAC: Fix crash in C64 demo


Commit: f8f6729caa92e49a4fe3c2e0ff1510588ef9a1c9
    https://github.com/scummvm/scummvm/commit/f8f6729caa92e49a4fe3c2e0ff1510588ef9a1c9
Author: AndywinXp (andywinxp at gmail.com)
Date: 2024-07-12T17:25:01+02:00

Commit Message:
SCUMM: MANIAC: Fix crash in C64 demo

This closes #15256

Changed paths:
    engines/scumm/script.cpp


diff --git a/engines/scumm/script.cpp b/engines/scumm/script.cpp
index 45ed82e6b76..97bdca0fb94 100644
--- a/engines/scumm/script.cpp
+++ b/engines/scumm/script.cpp
@@ -42,6 +42,14 @@ void ScummEngine::runScript(int script, bool freezeResistant, bool recursive, in
 	byte scriptType;
 	int slot;
 
+	// WORKAROUND for crash (#15256) in Maniac Mansion C64 demo:
+	// Attempting to, as any character, give the can of Pepsi to any other character
+	// attempts to start script 43. Unfortunately script 43 does not exist in
+	// the resources and crashes the game even on the original executable :-)
+	if (enhancementEnabled(kEnhGameBreakingBugFixes) && _game.id == GID_MANIAC &&
+		_game.version == 0 && (_game.features & GF_DEMO) && script == 43)
+		return;
+
  	if (!script)
 		return;