diff options
| author | Max Horn | 2008-09-16 11:42:21 +0000 |
|---|---|---|
| committer | Max Horn | 2008-09-16 11:42:21 +0000 |
| commit | 706fb37061d96fdf5c8d1a202d6dcc9a799c8d2b (patch) | |
| tree | 2951410fcbcd06b5e33f7f997ee8a739ef974505 /engines/scumm/smush/smush_player.cpp | |
| parent | 3bffca569f6d4677ca5502dbe3a7f8ef33f369be (diff) | |
| download | scummvm-rg350-706fb37061d96fdf5c8d1a202d6dcc9a799c8d2b.tar.gz scummvm-rg350-706fb37061d96fdf5c8d1a202d6dcc9a799c8d2b.tar.bz2 scummvm-rg350-706fb37061d96fdf5c8d1a202d6dcc9a799c8d2b.zip | |
Modified uncompress in common/zlib.h to return a bool, so that we don't have to #include the real zlib.h; fixed PSP backend to not run uncompress inside an assert (which would cause it to not be invoked when turning off asserts)
svn-id: r34576
Diffstat (limited to 'engines/scumm/smush/smush_player.cpp')
| -rw-r--r-- | engines/scumm/smush/smush_player.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/engines/scumm/smush/smush_player.cpp b/engines/scumm/smush/smush_player.cpp index fcc0541d2c..6b79b7e2c4 100644 --- a/engines/scumm/smush/smush_player.cpp +++ b/engines/scumm/smush/smush_player.cpp @@ -791,8 +791,7 @@ void SmushPlayer::handleZlibFrameObject(int32 subSize, Common::SeekableReadStrea unsigned long decompressedSize = READ_BE_UINT32(chunkBuffer); byte *fobjBuffer = (byte *)malloc(decompressedSize); - int result = Common::uncompress(fobjBuffer, &decompressedSize, chunkBuffer + 4, chunkSize - 4); - if (result != Common::ZLIB_OK) + if (!Common::uncompress(fobjBuffer, &decompressedSize, chunkBuffer + 4, chunkSize - 4)) error("SmushPlayer::handleZlibFrameObject() Zlib uncompress error"); free(chunkBuffer); |