From eb61855ca02cf2d058244b49d972d36ea3e0c2a1 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Sat, 10 Aug 2013 22:17:10 +0200
Subject: MORTEVIELLE: Avoid loading sfx and noise files multiple times

---
 engines/mortevielle/mortevielle.cpp | 3 +++
 engines/mortevielle/speech.cpp      | 3 ---
 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:
-- 
cgit v1.2.3