diff options
| author | Travis Howell | 2006-11-19 00:38:37 +0000 |
|---|---|---|
| committer | Travis Howell | 2006-11-19 00:38:37 +0000 |
| commit | 378982899382e139a12ff4bc1a8e29c74abafca9 (patch) | |
| tree | 4e09c00f1c4d44f0ad9bb6c3d1c80f51ff69ce08 /engines/scumm/script.cpp | |
| parent | c558018bd97858d2ca52afd9995a70f83ee34bd6 (diff) | |
| download | scummvm-rg350-378982899382e139a12ff4bc1a8e29c74abafca9.tar.gz scummvm-rg350-378982899382e139a12ff4bc1a8e29c74abafca9.tar.bz2 scummvm-rg350-378982899382e139a12ff4bc1a8e29c74abafca9.zip | |
The script freezeCount isn't used by SCUMM 1/2 games at all
svn-id: r24741
Diffstat (limited to 'engines/scumm/script.cpp')
| -rw-r--r-- | engines/scumm/script.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/engines/scumm/script.cpp b/engines/scumm/script.cpp index ea03509200..2b4be50ff6 100644 --- a/engines/scumm/script.cpp +++ b/engines/scumm/script.cpp @@ -346,8 +346,7 @@ void ScummEngine::runScriptNested(int script) { // stopped in the meantime, and if it did not already move on. slot = &vm.slot[nest->slot]; if (slot->number == nest->number && slot->where == nest->where && - slot->status != ssDead && (slot->freezeCount == 0 || - _game.version <= 2)) { + slot->status != ssDead && slot->freezeCount == 0) { _currentScript = nest->slot; getScriptBaseAddress(); getScriptEntryPoint(); @@ -859,7 +858,6 @@ void ScummEngine::freezeScripts(int flag) { for (i = 0; i < NUM_SCRIPT_SLOT; i++) { if (_currentScript != i && vm.slot[i].status != ssDead && !vm.slot[i].freezeResistant) { vm.slot[i].status |= 0x80; - vm.slot[i].freezeCount = 1; } } return; @@ -887,7 +885,6 @@ void ScummEngine::unfreezeScripts() { if (_game.version <= 2) { for (i = 0; i < NUM_SCRIPT_SLOT; i++) { vm.slot[i].status &= 0x7F; - vm.slot[i].freezeCount = 0; } return; } |