aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorFlorian Kagerer2010-08-20 17:04:32 +0000
committerFlorian Kagerer2010-08-20 17:04:32 +0000
commitb55a70acb88a7375ac21351450ea99ed2f72d820 (patch)
treeb8b0becec25f5d26551bcfd908e38dbfd8f665af /engines
parent9d5dada110c5563fd77ed19b061ee1a92cde952c (diff)
downloadscummvm-rg350-b55a70acb88a7375ac21351450ea99ed2f72d820.tar.gz
scummvm-rg350-b55a70acb88a7375ac21351450ea99ed2f72d820.tar.bz2
scummvm-rg350-b55a70acb88a7375ac21351450ea99ed2f72d820.zip
KYRA/TOWNS: fix memory leak and some cleanup
svn-id: r52232
Diffstat (limited to 'engines')
-rw-r--r--engines/kyra/sound_towns.cpp1
-rw-r--r--engines/scumm/script_v5.cpp1
2 files changed, 1 insertions, 1 deletions
diff --git a/engines/kyra/sound_towns.cpp b/engines/kyra/sound_towns.cpp
index 02651102c2..16004159ab 100644
--- a/engines/kyra/sound_towns.cpp
+++ b/engines/kyra/sound_towns.cpp
@@ -48,6 +48,7 @@ SoundTowns::SoundTowns(KyraEngine_v1 *vm, Audio::Mixer *mixer)
SoundTowns::~SoundTowns() {
AudioCD.stop();
haltTrack();
+ delete _driver;
delete[] _musicTrackData;
delete[] _sfxFileData;
}
diff --git a/engines/scumm/script_v5.cpp b/engines/scumm/script_v5.cpp
index 39e691c891..8d986afc66 100644
--- a/engines/scumm/script_v5.cpp
+++ b/engines/scumm/script_v5.cpp
@@ -1978,7 +1978,6 @@ void ScummEngine_v5::o5_startMusic() {
result = _sound->getCurrentCDSound();
break;
case 0xFF:
- // TODO: Might return current CD volume in FM-TOWNS Loom. See also bug #805691.
result = _townsPlayer->getCurrentCdaVolume();
break;
default: