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

[Strangerke]

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

Summary:
3e75c5acc1 MORTEVIELLE: Wait for the end of sound in some more places
ef3c4689b3 MORTEVIELLE: Remove the detection of a broken menu.mor file. Bug reported by criezy


Commit: 3e75c5acc10259fb3cfbef4d275acbaf92cde1c0
    https://github.com/scummvm/scummvm/commit/3e75c5acc10259fb3cfbef4d275acbaf92cde1c0
Author: Strangerke (strangerke at scummvm.org)
Date: 2013-08-12T22:54:08-07:00

Commit Message:
MORTEVIELLE: Wait for the end of sound in some more places

Changed paths:
    engines/mortevielle/actions.cpp
    engines/mortevielle/sound.cpp
    engines/mortevielle/sound.h
    engines/mortevielle/utils.cpp



diff --git a/engines/mortevielle/actions.cpp b/engines/mortevielle/actions.cpp
index f7cc239..233f252 100644
--- a/engines/mortevielle/actions.cpp
+++ b/engines/mortevielle/actions.cpp
@@ -633,6 +633,7 @@ void MortevielleEngine::fctOpen() {
 				}
 				_openObjects[i] = _num;
 				displayAnimFrame(1, _num);
+				_soundManager.waitSpeech();
 			}
 			int tmpPlace = _coreVar._currPlace;
 			if (_coreVar._currPlace == CRYPT)
@@ -1147,10 +1148,7 @@ void MortevielleEngine::fctEnter() {
 				int randVal = (getRandomNumber(0, 10)) - 5;
 				_soundManager.startSpeech(7, randVal, 1);
 				displayAnimFrame(1, 1);
-				while (_mixer->isSoundHandleActive(_soundManager._soundHandle) && !keyPressed() && !_mouseClick && !shouldQuit())
-					;
-				// In case the handle is still active, stop it.
-				_mixer->stopHandle(_soundManager._soundHandle);
+				_soundManager.waitSpeech();
 
 				int charIndex = convertBitIndexToCharacterIndex(z);
 				++_coreVar._faithScore;
@@ -1172,10 +1170,7 @@ void MortevielleEngine::fctEnter() {
 			int randVal = (getRandomNumber(0, 10)) - 5;
 			_soundManager.startSpeech(7, randVal, 1);
 			displayAnimFrame(1, 1);
-			while (_mixer->isSoundHandleActive(_soundManager._soundHandle) && !keyPressed() && !_mouseClick && !shouldQuit())
-				;
-			// In case the handle is still active, stop it.
-			_mixer->stopHandle(_soundManager._soundHandle);
+			_soundManager.waitSpeech();
 
 			_coreVar._currPlace = _roomDoorId;
 			prepareDisplayText();
diff --git a/engines/mortevielle/sound.cpp b/engines/mortevielle/sound.cpp
index 30dc4ce..9fff106 100644
--- a/engines/mortevielle/sound.cpp
+++ b/engines/mortevielle/sound.cpp
@@ -784,4 +784,13 @@ void SoundManager::startSpeech(int rep, int ht, int typ) {
 	_vm->setPal(_vm->_numpal);
 }
 
+void SoundManager::waitSpeech() {
+	while (_mixer->isSoundHandleActive(_soundHandle) && !_vm->keyPressed() && !_vm->_mouseClick && !_vm->shouldQuit())
+		;
+	// In case the handle is still active, stop it.
+	_mixer->stopHandle(_soundHandle);
+
+	if (!_vm->keyPressed() && !_vm->_mouseClick && !_vm->shouldQuit())
+		g_system->delayMillis(600);
+}
 } // End of namespace Mortevielle
diff --git a/engines/mortevielle/sound.h b/engines/mortevielle/sound.h
index 1e4a4cd..cc0567f 100644
--- a/engines/mortevielle/sound.h
+++ b/engines/mortevielle/sound.h
@@ -98,6 +98,7 @@ public:
 	void loadAmbiantSounds();
 	void loadNoise();
 	void startSpeech(int rep, int ht, int typ);
+	void waitSpeech();
 };
 
 } // End of namespace Mortevielle
diff --git a/engines/mortevielle/utils.cpp b/engines/mortevielle/utils.cpp
index 80f1927..eac4546 100644
--- a/engines/mortevielle/utils.cpp
+++ b/engines/mortevielle/utils.cpp
@@ -2385,6 +2385,7 @@ void MortevielleEngine::prepareRoom() {
 							displayTextInVerbBar(getEngineString(S_HEAR_NOISE));
 							int rand = (getRandomNumber(0, 4)) - 2;
 							_soundManager.startSpeech(1, rand, 1);
+							_soundManager.waitSpeech();
 							clearVerbBar();
 						}
 					}
@@ -2511,7 +2512,7 @@ void MortevielleEngine::initCaveOrCellar() {
 	displayTextInVerbBar(getEngineString(S_SOMEONE_ENTERS));
 	int rand = (getRandomNumber(0, 4)) - 2;
 	_soundManager.startSpeech(2, rand, 1);
-
+	_soundManager.waitSpeech();
 	// The original was doing here a useless loop.
 	// It has been removed
 


Commit: ef3c4689b3bfb558bb257da9c1c3c9d6b5dcb3ad
    https://github.com/scummvm/scummvm/commit/ef3c4689b3bfb558bb257da9c1c3c9d6b5dcb3ad
Author: Strangerke (strangerke at scummvm.org)
Date: 2013-08-12T22:57:50-07:00

Commit Message:
MORTEVIELLE: Remove the detection of a broken menu.mor file. Bug reported by criezy

Changed paths:
    engines/mortevielle/detection_tables.h



diff --git a/engines/mortevielle/detection_tables.h b/engines/mortevielle/detection_tables.h
index 689fee1..5d59a48 100644
--- a/engines/mortevielle/detection_tables.h
+++ b/engines/mortevielle/detection_tables.h
@@ -37,20 +37,6 @@ static const ADGameDescription MortevielleGameDescriptions[] = {
 		ADGF_NO_FLAGS,
 		GUIO0()
 	},
-	// French
-	{
-		"mortevielle",
-		"",
-		{
-			{"menu.mor", 0, "3fef0a3f8fca99fdcb6dbca8cbcef46f", 160},
-			{"dxx.mor", 0, "949e68e829ecd5ad29e36a00347a9e7e", 207744},
-			AD_LISTEND
-		},
-		Common::FR_FRA,
-		Common::kPlatformDOS,
-		ADGF_NO_FLAGS,
-		GUIO0()
-	},
 	// German
 	{
 		"mortevielle",