[Scummvm-cvs-logs] SF.net SVN: scummvm: [29515] scummvm/trunk/engines/lure/res.cpp

[dreammaster at users.sourceforge.net]

Revision: 29515
          http://scummvm.svn.sourceforge.net/scummvm/?rev=29515&view=rev
Author:   dreammaster
Date:     2007-11-16 00:54:38 -0800 (Fri, 16 Nov 2007)

Log Message:
-----------
Bugfix for talk dialog not closing if the same character talks twice in immediate succession

Modified Paths:
--------------
    scummvm/trunk/engines/lure/res.cpp

Modified: scummvm/trunk/engines/lure/res.cpp
===================================================================
--- scummvm/trunk/engines/lure/res.cpp	2007-11-16 07:47:43 UTC (rev 29514)
+++ scummvm/trunk/engines/lure/res.cpp	2007-11-16 08:54:38 UTC (rev 29515)
@@ -486,15 +486,10 @@
 		deactivateHotspot(_talkingCharacter, true);
 		HotspotData *charHotspot = res.getHotspot(_talkingCharacter);
 		assert(charHotspot);
-		charHotspot->talkCountdown = 0;
-/*
-		if (charHotspot->talkDestCharacterId != 0) {
-			HotspotData *destHotspot = res.getHotspot(charHotspot->talkDestCharacterId);
-			if (destHotspot != NULL)
-				destHotspot->talkDestCharacterId = 0;
-		}
-*/
 		charHotspot->talkDestCharacterId = 0;
+
+		if (_talkingCharacter != id) 
+			charHotspot->talkCountdown = 0;
 	}
 
 	_talkingCharacter = id; 


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