diff options
| author | Max Horn | 2005-06-04 18:08:05 +0000 |
|---|---|---|
| committer | Max Horn | 2005-06-04 18:08:05 +0000 |
| commit | f1f7e19dfe8d2c939e3f6f397bbe7931b3edc98f (patch) | |
| tree | 4498949ff75e3536546517182888931775fb3a73 /scumm | |
| parent | 697124a1b9f45a055402ea24f251e9fae0b9590d (diff) | |
| download | scummvm-rg350-f1f7e19dfe8d2c939e3f6f397bbe7931b3edc98f.tar.gz scummvm-rg350-f1f7e19dfe8d2c939e3f6f397bbe7931b3edc98f.tar.bz2 scummvm-rg350-f1f7e19dfe8d2c939e3f6f397bbe7931b3edc98f.zip | |
Fix for bug #1202487 (MANIAC64: crash after using hunk-o-matic and pressing ESC)
svn-id: r18345
Diffstat (limited to 'scumm')
| -rw-r--r-- | scumm/script.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/scumm/script.cpp b/scumm/script.cpp index ba2eda9d88..37598b3c53 100644 --- a/scumm/script.cpp +++ b/scumm/script.cpp @@ -420,6 +420,12 @@ void ScummEngine::getScriptBaseAddress() { default: error("Bad type while getting base address"); } + + // The following fixes bug #1202487. Confirmed against disasm. + if (_version <= 2 && _scriptOrgPointer == NULL) { + ss->status = ssDead; + _currentScript = 0xFF; + } } |