diff options
| author | Max Horn | 2002-08-29 23:45:15 +0000 |
|---|---|---|
| committer | Max Horn | 2002-08-29 23:45:15 +0000 |
| commit | 41c2d6fba344f8688b9462371f13727053ccd890 (patch) | |
| tree | 687cdd692a2aba7ac85214a6066824fc14456d12 /scumm/script_v1.cpp | |
| parent | 4b83c17b31eaab340c8eccee2f64cd68e6c6feb8 (diff) | |
| download | scummvm-rg350-41c2d6fba344f8688b9462371f13727053ccd890.tar.gz scummvm-rg350-41c2d6fba344f8688b9462371f13727053ccd890.tar.bz2 scummvm-rg350-41c2d6fba344f8688b9462371f13727053ccd890.zip | |
sound system cleanup
svn-id: r4867
Diffstat (limited to 'scumm/script_v1.cpp')
| -rw-r--r-- | scumm/script_v1.cpp | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/scumm/script_v1.cpp b/scumm/script_v1.cpp index 106923aca9..8dfc3c9509 100644 --- a/scumm/script_v1.cpp +++ b/scumm/script_v1.cpp @@ -23,6 +23,7 @@ #include "stdafx.h" #include "scumm.h" #include "actor.h" +#include "scumm/sound.h" void Scumm::setupOpcodes() { @@ -2717,15 +2718,9 @@ void Scumm::decodeParseString() if (_gameId == GID_LOOM256) { _vars[VAR_MI1_TIMER] = 0; if (offset == 0 && delay == 0) { -#ifdef COMPRESSED_SOUND_FILE - if (_sound->stopMP3CD() == -1) -#endif - _system->stop_cdrom(); + _sound->stopCD(); } else { -#ifdef COMPRESSED_SOUND_FILE - if (_sound->playMP3CDTrack(1, 0, offset, delay) == -1) -#endif - _system->play_cdrom(1, 0, offset, delay); + _sound->playCDTrack(1, 0, offset, delay); } } else { warning("parseString: 8"); |