diff options
author | Travis Howell | 2005-05-01 03:17:45 +0000 |
---|---|---|
committer | Travis Howell | 2005-05-01 03:17:45 +0000 |
commit | cb6c2b9da5b49a8ef8617766d6e4421d8e8c0150 (patch) | |
tree | 0edc641aab5ea81a1651a46a3632a564ce319f7c /scumm | |
parent | 343debba1e3a097fbe47edad1ae4deb3a1a252e0 (diff) | |
download | scummvm-rg350-cb6c2b9da5b49a8ef8617766d6e4421d8e8c0150.tar.gz scummvm-rg350-cb6c2b9da5b49a8ef8617766d6e4421d8e8c0150.tar.bz2 scummvm-rg350-cb6c2b9da5b49a8ef8617766d6e4421d8e8c0150.zip |
Add extra cases for readdemo.
svn-id: r17879
Diffstat (limited to 'scumm')
-rw-r--r-- | scumm/script_v90he.cpp | 3 | ||||
-rw-r--r-- | scumm/sound.cpp | 5 | ||||
-rw-r--r-- | scumm/wiz_he.cpp | 7 |
3 files changed, 12 insertions, 3 deletions
diff --git a/scumm/script_v90he.cpp b/scumm/script_v90he.cpp index aa24c621b7..047f245f2c 100644 --- a/scumm/script_v90he.cpp +++ b/scumm/script_v90he.cpp @@ -2537,6 +2537,9 @@ void ScummEngine_v90he::o90_kernelSetFunctions() { _skipProcessActors = 0; redrawAllActors(); break; + case 27: + // Used in readdemo + break; case 42: _wiz._rectOverrideEnabled = true; _wiz._rectOverride.left = args[1]; diff --git a/scumm/sound.cpp b/scumm/sound.cpp index e759b52275..4932ed41d1 100644 --- a/scumm/sound.cpp +++ b/scumm/sound.cpp @@ -231,6 +231,11 @@ void Sound::playSound(int soundID, int heOffset, int heChannel, int heFlags) { if (_vm->_heversion >= 70 && soundID > _vm->_numSounds) { debug(1, "playSound #%d", soundID); + if (soundID >= 10000) { + // Special codes, used in pjgames + return; + } + int music_offs; char buf[32], buf1[128]; File musicFile; diff --git a/scumm/wiz_he.cpp b/scumm/wiz_he.cpp index 825ea5610e..11ef292fb2 100644 --- a/scumm/wiz_he.cpp +++ b/scumm/wiz_he.cpp @@ -1016,10 +1016,11 @@ uint8 *ScummEngine_v72he::drawWizImage(int resNum, int state, int x1, int y1, in case 1: // TODO Adding masking for flags 0x80 and 0x100 if (flags & 0x80) { + // Used in maze warning("drawWizImage: Unhandled flag 0x80"); - } - if (flags & 0x100) { - error("drawWizImage: Unhandled flag 0x100"); + } else if (flags & 0x100) { + // Used in readdemo + warning("drawWizImage: Unhandled flag 0x100"); } _wiz.copyWizImage(dst, wizd, cw, ch, x1, y1, width, height, &rScreen, palPtr); break; |