Ticket #2438: soundkludge-kludge.diff

scumm/script.cpp

@@ -356 +356 @@
         if (_currentScript == 0xFF)
                 return;
 
+        _hangCounter = 0;       // See o6_soundKludge()
+
         vm.slot[_currentScript].offs = _scriptPointer - _scriptOrgPointer;
 }
 

scumm/script_v6.cpp

@@ -2250 +2250 @@
 }
 
 void ScummEngine_v6::o6_soundKludge() {
+        // WORKAROUND: At least one of the CMI scripts will busy-wait while
+        // piling up calls to soundKludge(). At best, this will cause
+        // animations to freeze momentarily. On some platforms, it will cuse
+        // ScummVM itself to freeze indefinitely. See bug #1398195.
+
+        if (_gameId == GID_CMI && _hangCounter++ > 20) {
+                warning("Detected possible hang in script %d", vm.slot[_currentScript].number);
+                _scriptPointer--;
+                o6_breakHere();
+                return;
+        }
+
         int list[16];
         int num = getStackList(list, ARRAYSIZE(list));
 

scumm/scumm.h

@@ -614 +614 @@
         uint32 _localScriptOffsets[1024];
         const byte *_scriptPointer, *_scriptOrgPointer;
         byte _opcode, _currentScript;
+        uint32 _hangCounter;
         const byte * const *_lastCodePtr;
         int _resultVarNumber, _scummStackPos;
         int _vmStack[150];