[Scummvm-cvs-logs] scummvm master -> eb61855ca02cf2d058244b49d972d36ea3e0c2a1

Strangerke Strangerke at scummvm.org
Sat Aug 10 22:18:38 CEST 2013


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
eb61855ca0 MORTEVIELLE: Avoid loading sfx and noise files multiple times


Commit: eb61855ca02cf2d058244b49d972d36ea3e0c2a1
    https://github.com/scummvm/scummvm/commit/eb61855ca02cf2d058244b49d972d36ea3e0c2a1
Author: Strangerke (strangerke at scummvm.org)
Date: 2013-08-10T13:17:10-07:00

Commit Message:
MORTEVIELLE: Avoid loading sfx and noise files multiple times

Changed paths:
    engines/mortevielle/mortevielle.cpp
    engines/mortevielle/speech.cpp



diff --git a/engines/mortevielle/mortevielle.cpp b/engines/mortevielle/mortevielle.cpp
index c117e36..d46dfc1 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 1037d0a..0966930 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:






More information about the Scummvm-git-logs mailing list