diff options
| author | James Brown | 2002-03-14 08:04:21 +0000 |
|---|---|---|
| committer | James Brown | 2002-03-14 08:04:21 +0000 |
| commit | d0c6bc8f2060c1c1664cc6660987332c3c934448 (patch) | |
| tree | c52ab4d402d503c18945364a4e8983b442742bee /sound/imuse.cpp | |
| parent | ebb30d33b5470cca652858531e7f92c815700c31 (diff) | |
| download | scummvm-rg350-d0c6bc8f2060c1c1664cc6660987332c3c934448.tar.gz scummvm-rg350-d0c6bc8f2060c1c1664cc6660987332c3c934448.tar.bz2 scummvm-rg350-d0c6bc8f2060c1c1664cc6660987332c3c934448.zip | |
Rewire the MIDI subsystem to use drivers selecting from the commandline.
No -DTIMIDITY, etc! Yippie!. Also updated readme.
svn-id: r3743
Diffstat (limited to 'sound/imuse.cpp')
| -rw-r--r-- | sound/imuse.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/sound/imuse.cpp b/sound/imuse.cpp index 0a161029a6..065459d094 100644 --- a/sound/imuse.cpp +++ b/sound/imuse.cpp @@ -150,9 +150,12 @@ void SoundEngine::unlock() { } byte *SoundEngine::findTag(int sound, char *tag, int index) { - byte *ptr = _base_sounds[sound]; + byte *ptr = NULL; int32 size,pos; + if (_base_sounds) + ptr = _base_sounds[sound]; + if (ptr==NULL) { debug(1, "SoundEngine::findTag completely failed finding sound %d", sound); return 0; @@ -921,7 +924,7 @@ int SoundEngine::initialize(Scumm *scumm, SoundDriver *driver) { _s = scumm; _driver = (SOUND_DRIVER_TYPE*)driver; - + _master_volume = 127; if (_music_volume < 1) _music_volume = 60; |