aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStrangerke2013-08-10 22:17:10 +0200
committerStrangerke2013-08-10 22:17:10 +0200
commiteb61855ca02cf2d058244b49d972d36ea3e0c2a1 (patch)
tree8467c5164e460441ca763bda213f8b1b75a9528f
parent0c00a7fde8f373d45172afc53a2d44f8dc99702d (diff)
downloadscummvm-rg350-eb61855ca02cf2d058244b49d972d36ea3e0c2a1.tar.gz
scummvm-rg350-eb61855ca02cf2d058244b49d972d36ea3e0c2a1.tar.bz2
scummvm-rg350-eb61855ca02cf2d058244b49d972d36ea3e0c2a1.zip
MORTEVIELLE: Avoid loading sfx and noise files multiple times
-rw-r--r--engines/mortevielle/mortevielle.cpp3
-rw-r--r--engines/mortevielle/speech.cpp3
2 files changed, 3 insertions, 3 deletions
diff --git a/engines/mortevielle/mortevielle.cpp b/engines/mortevielle/mortevielle.cpp
index c117e36636..d46dfc16ac 100644
--- a/engines/mortevielle/mortevielle.cpp
+++ b/engines/mortevielle/mortevielle.cpp
@@ -227,6 +227,9 @@ Common::ErrorCode MortevielleEngine::initialize() {
_currGraphicalDevice = _newGraphicalDevice;
hirs();
+ _soundManager.loadNoise();
+ _soundManager.loadAmbiantSounds();
+
return Common::kNoError;
}
diff --git a/engines/mortevielle/speech.cpp b/engines/mortevielle/speech.cpp
index 1037d0abe4..0966930718 100644
--- a/engines/mortevielle/speech.cpp
+++ b/engines/mortevielle/speech.cpp
@@ -542,12 +542,9 @@ void SpeechManager::startSpeech(int rep, int ht, int typ) {
cctable(_tbi);
switch (typ) {
case 1:
- _vm->_soundManager.loadNoise();
_vm->_soundManager.regenbruit();
break;
case 2:
- //TODO: Only call it once
- _vm->_soundManager.loadAmbiantSounds();
loadPhonemeSounds();
break;
default: