[Scummvm-cvs-logs] SF.net SVN: scummvm: [21379] scummvm/trunk/engines/kyra

vinterstum at users.sourceforge.net vinterstum at users.sourceforge.net
Sun Mar 19 00:36:03 CET 2006


Revision: 21379
Author:   vinterstum
Date:     2006-03-19 00:35:43 -0800 (Sun, 19 Mar 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm/?rev=21379&view=rev

Log Message:
-----------
Makes sure Brandon actually dies when he turns to stone in the kyragem room

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/gui.cpp
    scummvm/trunk/engines/kyra/kyra.cpp
Modified: scummvm/trunk/engines/kyra/gui.cpp
===================================================================
--- scummvm/trunk/engines/kyra/gui.cpp	2006-03-19 07:54:30 UTC (rev 21378)
+++ scummvm/trunk/engines/kyra/gui.cpp	2006-03-19 08:35:43 UTC (rev 21379)
@@ -408,7 +408,7 @@
 	_displayMenu = true;
 
 	// XXX setLabels
-	if (_currentCharacter->sceneId == 210) {
+	if (_currentCharacter->sceneId == 210 && _deathHandler == 0xFF) {
 		snd_playSoundEffect(0x36);
 		return 0;
 	}

Modified: scummvm/trunk/engines/kyra/kyra.cpp
===================================================================
--- scummvm/trunk/engines/kyra/kyra.cpp	2006-03-19 07:54:30 UTC (rev 21378)
+++ scummvm/trunk/engines/kyra/kyra.cpp	2006-03-19 08:35:43 UTC (rev 21379)
@@ -680,7 +680,6 @@
 		}
 		
 		if (_deathHandler != 0xFF) {
-			_deathHandler = 0xFF;
 			snd_playWanderScoreViaMap(0, 1);
 			snd_playSoundEffect(49);
 			_screen->hideMouse();
@@ -688,6 +687,7 @@
 			destroyMouseItem();
 			_screen->showMouse();
 			buttonMenuCallback(0);
+			_deathHandler = 0xFF;
 		}
 		
 		if (_brandonStatusBit & 2) {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.





More information about the Scummvm-git-logs mailing list