diff options
| author | Paul Gilbert | 2011-05-27 20:55:09 +1000 |
|---|---|---|
| committer | Paul Gilbert | 2011-05-27 20:55:09 +1000 |
| commit | fd4c55850d0afd40be779169c917bdbf34ba7959 (patch) | |
| tree | 554bf4ca7f3975bf85522531d325ec229d855bf3 /engines/tsage/sound.cpp | |
| parent | 1d190139125bd5ed0af43213c779a71b3b0615f5 (diff) | |
| download | scummvm-rg350-fd4c55850d0afd40be779169c917bdbf34ba7959.tar.gz scummvm-rg350-fd4c55850d0afd40be779169c917bdbf34ba7959.tar.bz2 scummvm-rg350-fd4c55850d0afd40be779169c917bdbf34ba7959.zip | |
TSAGE: Bugfixes for sound de-initialisation
Diffstat (limited to 'engines/tsage/sound.cpp')
| -rw-r--r-- | engines/tsage/sound.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/engines/tsage/sound.cpp b/engines/tsage/sound.cpp index c66b428950..b6b434e279 100644 --- a/engines/tsage/sound.cpp +++ b/engines/tsage/sound.cpp @@ -129,9 +129,7 @@ Common::List<SoundDriverEntry> &SoundManager::buildDriverList(bool detectFlag) { } void SoundManager::installConfigDrivers() { -#ifdef TSAGE_SOUND installDriver(ADLIB_DRIVER_NUM); -#endif } Common::List<SoundDriverEntry> &SoundManager::getDriverList(bool detectFlag) { @@ -623,7 +621,7 @@ void SoundManager::_sfRethinkVoiceTypes() { } } - int var2 = 0; +// int var2 = 0; for (Common::List<Sound *>::iterator playIterator = sfManager()._playList.begin(); playIterator != sfManager()._playList.end(); ++playIterator) { @@ -835,6 +833,10 @@ Sound::Sound() { _field26E = NULL; } +Sound::~Sound() { + stop(); +} + void Sound::play(int soundNum) { prime(soundNum); _globals->_soundManager.addToPlayList(this); @@ -1158,6 +1160,7 @@ const byte adlib_group_data[] = { 1, 1, 9, 1, 0xff }; AdlibSoundDriver::AdlibSoundDriver() { _minVersion = 0x102; + _maxVersion = 0x10A; _groupData.groupMask = 1; |