diff options
| author | Martin Kiewitz | 2010-07-11 11:52:17 +0000 |
|---|---|---|
| committer | Martin Kiewitz | 2010-07-11 11:52:17 +0000 |
| commit | 38d79f60e3217debbf99c971a87ea581c00f007f (patch) | |
| tree | 43dc6789c96bdc9fdc718d113d2f72161317a5c0 | |
| parent | 110d644f492ce624f70c62639b5fb01832022a58 (diff) | |
| download | scummvm-rg350-38d79f60e3217debbf99c971a87ea581c00f007f.tar.gz scummvm-rg350-38d79f60e3217debbf99c971a87ea581c00f007f.tar.bz2 scummvm-rg350-38d79f60e3217debbf99c971a87ea581c00f007f.zip | |
SCI: changing signature for kDoSound(resume) it seems its called right after restoring to resume music - which we do already automatically
svn-id: r50800
| -rw-r--r-- | engines/sci/engine/kernel.cpp | 2 | ||||
| -rw-r--r-- | engines/sci/sound/soundcmd.cpp | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/engines/sci/engine/kernel.cpp b/engines/sci/engine/kernel.cpp index f3f0c37391..9f6bab898f 100644 --- a/engines/sci/engine/kernel.cpp +++ b/engines/sci/engine/kernel.cpp @@ -323,7 +323,7 @@ static const SciKernelMapSubEntry kDoSound_subops[] = { { SIG_SOUNDSCI0, 4, MAP_CALL(DoSoundMute), "(i)", NULL }, { SIG_SOUNDSCI0, 5, MAP_CALL(DoSoundStop), "o", NULL }, { SIG_SOUNDSCI0, 6, MAP_CALL(DoSoundPause), "i", NULL }, - { SIG_SOUNDSCI0, 7, MAP_CALL(DoSoundResume), "o", NULL }, + { SIG_SOUNDSCI0, 7, MAP_CALL(DoSoundResume), "", NULL }, { SIG_SOUNDSCI0, 8, MAP_CALL(DoSoundMasterVolume), "(i)", NULL }, { SIG_SOUNDSCI0, 9, MAP_CALL(DoSoundUpdate), "o", NULL }, { SIG_SOUNDSCI0, 10, MAP_CALL(DoSoundFade), "o", NULL }, diff --git a/engines/sci/sound/soundcmd.cpp b/engines/sci/sound/soundcmd.cpp index 11b0215a32..51832af09f 100644 --- a/engines/sci/sound/soundcmd.cpp +++ b/engines/sci/sound/soundcmd.cpp @@ -251,6 +251,9 @@ reg_t SoundCommandParser::kDoSoundPause(int argc, reg_t *argv, reg_t acc) { // SCI0 only command reg_t SoundCommandParser::kDoSoundResume(int argc, reg_t *argv, reg_t acc) { + // this doesn't seem to do what we think it's doing + // it's called with no arguments at all (just restore a game in qfg1) + return acc; reg_t obj = argv[0]; MusicEntry *musicSlot = _music->getSlot(obj); |