diff options
| author | Strangerke | 2013-08-11 18:09:40 +0200 |
|---|---|---|
| committer | Strangerke | 2013-08-11 18:09:40 +0200 |
| commit | 54f391a6899cc46c651ba0d077ae5ea47fc32dd5 (patch) | |
| tree | e952dfe5ff79cc08f0082fd35b7f5555a55892c3 /engines/mortevielle/mortevielle.cpp | |
| parent | f621297dc76bb545ed5312fb941eea1da26a7052 (diff) | |
| download | scummvm-rg350-54f391a6899cc46c651ba0d077ae5ea47fc32dd5.tar.gz scummvm-rg350-54f391a6899cc46c651ba0d077ae5ea47fc32dd5.tar.bz2 scummvm-rg350-54f391a6899cc46c651ba0d077ae5ea47fc32dd5.zip | |
MORTEVIELLE: Merge SpeechManager and SoundManager
Diffstat (limited to 'engines/mortevielle/mortevielle.cpp')
| -rw-r--r-- | engines/mortevielle/mortevielle.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/engines/mortevielle/mortevielle.cpp b/engines/mortevielle/mortevielle.cpp index 1296e645e2..0b6b82c1a9 100644 --- a/engines/mortevielle/mortevielle.cpp +++ b/engines/mortevielle/mortevielle.cpp @@ -56,7 +56,6 @@ MortevielleEngine::MortevielleEngine(OSystem *system, const ADGameDescription *g _mouse.setParent(this); _text.setParent(this); _soundManager.setParent(this); - _speechManager.setParent(this); _savegameManager.setParent(this); _lastGameFrame = 0; @@ -365,7 +364,7 @@ Common::Error MortevielleEngine::run() { // Cleanup (allocated in initialize()) _screenSurface.free(); - free(_speechManager._cfiphBuffer); + free(_soundManager._cfiphBuffer); free(_cfiecBuffer); return Common::kNoError; |