diff options
| author | RichieSams | 2013-09-04 00:35:34 -0500 |
|---|---|---|
| committer | RichieSams | 2013-09-04 00:35:34 -0500 |
| commit | 1697a9c83114b181074f43d9f872f6e5c43c0a5f (patch) | |
| tree | 56805a99c5a26be2d8dc3773fd258cc9641544c1 | |
| parent | 150a4793a670fb06b7997d7964f9626f3a238766 (diff) | |
| parent | 9b027771557bf308d8aa92ea9c25b30be15b68d6 (diff) | |
| download | scummvm-rg350-1697a9c83114b181074f43d9f872f6e5c43c0a5f.tar.gz scummvm-rg350-1697a9c83114b181074f43d9f872f6e5c43c0a5f.tar.bz2 scummvm-rg350-1697a9c83114b181074f43d9f872f6e5c43c0a5f.zip | |
Merge branch 'master' into zvision
| -rw-r--r-- | engines/sci/engine/workarounds.cpp | 1 | ||||
| -rw-r--r-- | video/codecs/truemotion1.cpp | 5 |
2 files changed, 5 insertions, 1 deletions
diff --git a/engines/sci/engine/workarounds.cpp b/engines/sci/engine/workarounds.cpp index 49d6145607..154ac8f8b4 100644 --- a/engines/sci/engine/workarounds.cpp +++ b/engines/sci/engine/workarounds.cpp @@ -51,6 +51,7 @@ const SciWorkaroundEntry arithmeticWorkarounds[] = { // gameID, room,script,lvl, object-name, method-name, call,index, workaround const SciWorkaroundEntry uninitializedReadWorkarounds[] = { + { GID_CAMELOT, 40, 40, 0, "Rm40", "handleEvent", -1, 0, { WORKAROUND_FAKE, 0 } }, // when looking at the ground at the pool of Siloam - bug #3614968 { GID_CASTLEBRAIN, 280, 280, 0, "programmer", "dispatchEvent", -1, 0, { WORKAROUND_FAKE, 0xf } }, // pressing 'q' on the computer screen in the robot room, and closing the help dialog that pops up (bug #3039656). Moves the cursor to the view with the ID returned (in this case, the robot hand) { GID_CNICK_KQ, -1, 0, 1, "Character", "say", -1, -1, { WORKAROUND_FAKE, 0 } }, // checkers/backgammon, like in hoyle 3 - temps 504 and 505 - bug #3606025 { GID_CNICK_KQ, -1, 700, 0, "gcWindow", "open", -1, -1, { WORKAROUND_FAKE, 0 } }, // when entering the control menu, like in hoyle 3 diff --git a/video/codecs/truemotion1.cpp b/video/codecs/truemotion1.cpp index e475c8426c..720e86a4ff 100644 --- a/video/codecs/truemotion1.cpp +++ b/video/codecs/truemotion1.cpp @@ -400,11 +400,14 @@ void TrueMotion1Decoder::decode16() { const Graphics::Surface *TrueMotion1Decoder::decodeImage(Common::SeekableReadStream *stream) { decodeHeader(stream); - if (compressionTypes[_header.compression].algorithm == ALGO_NOP) + if (compressionTypes[_header.compression].algorithm == ALGO_NOP) { + delete[] _buf; return 0; + } if (compressionTypes[_header.compression].algorithm == ALGO_RGB24H) { warning("Unhandled TrueMotion1 24bpp frame"); + delete[] _buf; return 0; } else decode16(); |