diff options
| author | Jonathan Gray | 2002-10-18 09:58:16 +0000 |
|---|---|---|
| committer | Jonathan Gray | 2002-10-18 09:58:16 +0000 |
| commit | d0565061a08d93b5fe545740bb37dbc83c12ddfe (patch) | |
| tree | bdf9e2e391fc34a301812200c7cc2ce0fb513461 | |
| parent | 209e723a761f727c8c0aca9228d50345e0c9a9d4 (diff) | |
| download | scummvm-rg350-d0565061a08d93b5fe545740bb37dbc83c12ddfe.tar.gz scummvm-rg350-d0565061a08d93b5fe545740bb37dbc83c12ddfe.tar.bz2 scummvm-rg350-d0565061a08d93b5fe545740bb37dbc83c12ddfe.zip | |
a few small changes to make the full throttle demo work
svn-id: r5185
| -rw-r--r-- | scumm/script_v2.cpp | 3 | ||||
| -rw-r--r-- | scumm/smush/player.cpp | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/scumm/script_v2.cpp b/scumm/script_v2.cpp index 91dcfa75b1..a48fb529f8 100644 --- a/scumm/script_v2.cpp +++ b/scumm/script_v2.cpp @@ -733,7 +733,8 @@ int Scumm::readArray(int array, int idx, int base) void Scumm::writeArray(int array, int idx, int base, int value) { ArrayHeader *ah = (ArrayHeader *)getResourceAddress(rtString, readVar(array)); - assert(ah); + if (!ah) + return; base += idx * ah->dim1_size; assert(base >= 0 && base < ah->dim1_size * ah->dim2_size); diff --git a/scumm/smush/player.cpp b/scumm/smush/player.cpp index ce2d92718c..412e78b238 100644 --- a/scumm/smush/player.cpp +++ b/scumm/smush/player.cpp @@ -515,7 +515,7 @@ void SmushPlayer::handleFrameObject(Chunk & b) { decodeCodec(b, r, _codec1); break; case 37: - assert(left == 0 && top == 0); + // assert(left == 0 && top == 0); initSize(r, true, false); decodeCodec(b, r, _codec37); _codec37Called = true; |