diff options
author | Paweł Kołodziejski | 2002-12-29 16:58:37 +0000 |
---|---|---|
committer | Paweł Kołodziejski | 2002-12-29 16:58:37 +0000 |
commit | f870d15d42aa31ae1c720a1a0fa147e92e3bbcea (patch) | |
tree | facce3ce8dd79225bcc0ad1ddb1c363eb9f04c9b /scumm/smush | |
parent | 1a1bcc6695a6d33bddecb9bd73daf83f6468f6cd (diff) | |
download | scummvm-rg350-f870d15d42aa31ae1c720a1a0fa147e92e3bbcea.tar.gz scummvm-rg350-f870d15d42aa31ae1c720a1a0fa147e92e3bbcea.tar.bz2 scummvm-rg350-f870d15d42aa31ae1c720a1a0fa147e92e3bbcea.zip |
disabled CMI smush audio, cleanup codec 47, correct path param
svn-id: r6252
Diffstat (limited to 'scumm/smush')
-rw-r--r-- | scumm/smush/codec47.cpp | 18 | ||||
-rw-r--r-- | scumm/smush/player.cpp | 4 |
2 files changed, 3 insertions, 19 deletions
diff --git a/scumm/smush/codec47.cpp b/scumm/smush/codec47.cpp index da253f5d18..6bfd28d7ff 100644 --- a/scumm/smush/codec47.cpp +++ b/scumm/smush/codec47.cpp @@ -25,24 +25,6 @@ #include "blitter.h" bool DumpDecoder::decode(Blitter & dst, Chunk & src) { - int32 i = 0; - /*int32 seq =*/ src.getWord(); - int32 codec = src.getByte(); - /*int32 flags =*/ src.getByte(); - int32 unknown[22]; - for(i = 0; i < 0; i++) { - unknown[i] = src.getByte(); - } - if(codec == 5 || codec == 1) { - do { - int32 code = src.getByte(); - int32 length = (code >> 1) + 1; - if (code & 1) - dst.put(src.getChar(), length); - else - dst.blit(src, length); - } while (!src.eof()); - } return true; } diff --git a/scumm/smush/player.cpp b/scumm/smush/player.cpp index 960282e28b..616b712520 100644 --- a/scumm/smush/player.cpp +++ b/scumm/smush/player.cpp @@ -23,6 +23,7 @@ #include "common/file.h" #include "common/util.h" #include "common/engine.h" // for debug, warning, error +#include "scumm/scumm.h" #include "player.h" @@ -564,7 +565,8 @@ void SmushPlayer::handleFrame(Chunk & b) { handleDeltaPalette(*sub); break; case TYPE_IACT: - handleImuseAction(*sub); + if (g_scumm->_gameId != GID_CMI) + handleImuseAction(*sub); break; case TYPE_STOR: handleStore(*sub); |