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

Strangerke Strangerke at scummvm.org
Mon Aug 19 20:44:40 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:
f979de547b MORTEVIELLE: Avoid a crash related to speech during the ending sequence of the German version


Commit: f979de547bdbee52466054c7c1148c440f4e811f
    https://github.com/scummvm/scummvm/commit/f979de547bdbee52466054c7c1148c440f4e811f
Author: Strangerke (strangerke at scummvm.org)
Date: 2013-08-19T11:42:47-07:00

Commit Message:
MORTEVIELLE: Avoid a crash related to speech during the ending sequence of the German version

Changed paths:
    engines/mortevielle/sound.cpp



diff --git a/engines/mortevielle/sound.cpp b/engines/mortevielle/sound.cpp
index 3bea96b..b670246 100644
--- a/engines/mortevielle/sound.cpp
+++ b/engines/mortevielle/sound.cpp
@@ -741,6 +741,10 @@ void SoundManager::startSpeech(int rep, int ht, int typ) {
 	uint16 savph[501];
 	int tempo;
 
+	// Hack to avoid a crash in the ending version. To be removed when the speech are implemented
+	if ((rep == 141) && (typ == 0))
+		return;
+
 	if (_vm->_soundOff)
 		return;
 






More information about the Scummvm-git-logs mailing list