ScummVM/scummvm
1
0
Fork 0
mirror of https://github.com/scummvm/scummvm.git synced 2026-06-20 05:45:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix Indy4/MI2 crash due to VirtScroll code.

Browse Source 
Cleanup \N's - For gods sake fix your CVS client :)

svn-id: r4067
This commit is contained in:
James Brown
2002-04-24 04:26:09 +00:00
parent 20e9ad5e23
commit 280136f13a
11 changed files with 98 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files
script.cpp
+4 -8
View File
@@ -32,6 +32,7 @@ void Scumm::runScript(int script, int a, int b, int16 * lvarptr)
int slot;
ScriptSlot *s;
if (script == 0)
return;
@@ -267,6 +268,7 @@ void Scumm::getScriptEntryPoint()
/* Execute a script - Read opcode, and execute it from the table */
void Scumm::executeScript()
{
OpcodeProc op;
while (_currentScript != 0xFF) {
_opcode = fetchScriptByte();
@@ -966,10 +968,7 @@ void Scumm::beginOverride()
idx = vm.cutSceneStackPointer;
ptr = &vm.cutScenePtr[idx];
/* if (!*ptr) { // ENDER - FIXME - We don't need this?
vm.slot[_currentScript].cutsceneOverride++;
}
*/
*ptr = _scriptPointer - _scriptOrgPointer;
vm.cutSceneScript[idx] = _currentScript;
@@ -985,10 +984,7 @@ void Scumm::endOverride()
idx = vm.cutSceneStackPointer;
ptr = &vm.cutScenePtr[idx];
/* if (!*ptr) { // ENDER - FIXME - We don't need this?
// vm.slot[_currentScript].cutsceneOverride--;
//printf("ending override: %d on script %d\n", vm.slot[_currentScript].cutsceneOverride, _currentScript);
} */
*ptr = 0;
vm.cutSceneScript[idx] = 0;
_vars[VAR_OVERRIDE] = 0;