diff options
| author | James Brown | 2002-02-20 01:56:41 +0000 |
|---|---|---|
| committer | James Brown | 2002-02-20 01:56:41 +0000 |
| commit | f0b89789eb2cb99095a61a80169fa1413a805398 (patch) | |
| tree | 0973da001e7189b7453da0fbfb7082a6055e3bf7 | |
| parent | 495be470074a55c29ac6b721ff6c67cde5395608 (diff) | |
| download | scummvm-rg350-f0b89789eb2cb99095a61a80169fa1413a805398.tar.gz scummvm-rg350-f0b89789eb2cb99095a61a80169fa1413a805398.tar.bz2 scummvm-rg350-f0b89789eb2cb99095a61a80169fa1413a805398.zip | |
Quick patch for a Zak script bug.
svn-id: r3613
| -rw-r--r-- | script_v1.cpp | 5 | ||||
| -rw-r--r-- | scummvm.cpp | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/script_v1.cpp b/script_v1.cpp index e89b042c27..edf6ca89e6 100644 --- a/script_v1.cpp +++ b/script_v1.cpp @@ -2268,7 +2268,10 @@ void Scumm::o5_wait() { if (derefActorSafe(getVarOrDirectByte(0x80), "o5_wait")->moving) break; return; - case 2: /* wait for message */ + case 2: /* wait for message */ + if ((_currentRoom == 0) && (_gameId == GID_ZAK256)) // Bypass Zak256 script hang + return; + if (_vars[VAR_HAVE_MSG]) break; return; diff --git a/scummvm.cpp b/scummvm.cpp index 67a51faa84..406aea4067 100644 --- a/scummvm.cpp +++ b/scummvm.cpp @@ -234,6 +234,9 @@ void Scumm::scummMain(int argc, char **argv) { _vars[VAR_VERSION] = 21; #endif _vars[VAR_DEBUGMODE] = _debugMode; + + _haveMsg = 0xFF; + _vars[VAR_HAVE_MSG] = 0xFF; if (_gameId==GID_MONKEY) { _vars[74] = 1225; |