diff options
| author | Norbert Lange | 2009-08-01 23:02:45 +0000 |
|---|---|---|
| committer | Norbert Lange | 2009-08-01 23:02:45 +0000 |
| commit | a28281072d72197526e68a98442df55c9b5918e4 (patch) | |
| tree | e06fe4e9c618e78401dcf6b2d29daa53002cd3b0 /engines/scumm/scumm.cpp | |
| parent | ebe409058082e50f8377072eedaa7af34d9dc51a (diff) | |
| download | scummvm-rg350-a28281072d72197526e68a98442df55c9b5918e4.tar.gz scummvm-rg350-a28281072d72197526e68a98442df55c9b5918e4.tar.bz2 scummvm-rg350-a28281072d72197526e68a98442df55c9b5918e4.zip | |
engines/scumm/scumm.cpp: terminate method is pretty redundant - removed
tfmx, player_v4a: refactored Tfmx to allow sharing of resources between 2 instances. Needed changes in player_v4a aswell
svn-id: r42980
Diffstat (limited to 'engines/scumm/scumm.cpp')
| -rw-r--r-- | engines/scumm/scumm.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp index b02c3b3346..5e3bd66b0a 100644 --- a/engines/scumm/scumm.cpp +++ b/engines/scumm/scumm.cpp @@ -546,10 +546,7 @@ ScummEngine::ScummEngine(OSystem *syst, const DetectorResult &dr) ScummEngine::~ScummEngine() { Common::clearAllDebugChannels(); - if (_musicEngine) { - _musicEngine->terminate(); - delete _musicEngine; - } + delete _musicEngine; _mixer->stopAll(); |