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

[athrxx at users.sourceforge.net]

Revision: 39858
          http://scummvm.svn.sourceforge.net/scummvm/?rev=39858&view=rev
Author:   athrxx
Date:     2009-04-05 11:36:38 +0000 (Sun, 05 Apr 2009)

Log Message:
-----------
LOL: fix speech bug, which would cause a hang up when entering roland's house

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/lol.cpp
    scummvm/trunk/engines/kyra/script_lol.cpp

Modified: scummvm/trunk/engines/kyra/lol.cpp
===================================================================
--- scummvm/trunk/engines/kyra/lol.cpp	2009-04-05 07:52:21 UTC (rev 39857)
+++ scummvm/trunk/engines/kyra/lol.cpp	2009-04-05 11:36:38 UTC (rev 39858)
@@ -1522,7 +1522,7 @@
 			return 2;
 	}
 
-	return 1;
+	return 0;
 }
 
 void LoLEngine::snd_stopSpeech(bool setFlag) {

Modified: scummvm/trunk/engines/kyra/script_lol.cpp
===================================================================
--- scummvm/trunk/engines/kyra/script_lol.cpp	2009-04-05 07:52:21 UTC (rev 39857)
+++ scummvm/trunk/engines/kyra/script_lol.cpp	2009-04-05 11:36:38 UTC (rev 39858)
@@ -1372,7 +1372,7 @@
 		return 1;
 	}
 
-	if (stackPos(0) != -1)
+	if (stackPos(0) != -2)
 		return characterSays(stackPos(0), stackPos(1), stackPos(2));
 	else
 		return snd_characterSpeaking();


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