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

dreammaster at users.sourceforge.net dreammaster at users.sourceforge.net
Fri Dec 7 09:16:52 CET 2007


Revision: 29743
          http://scummvm.svn.sourceforge.net/scummvm/?rev=29743&view=rev
Author:   dreammaster
Date:     2007-12-07 00:16:52 -0800 (Fri, 07 Dec 2007)

Log Message:
-----------
Fix for bug 1843961: Assertion on talking to a NPC - initial 'hey wait' dialog was resetting the destination character just before the conversation started

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

Modified: scummvm/trunk/engines/lure/hotspots.cpp
===================================================================
--- scummvm/trunk/engines/lure/hotspots.cpp	2007-12-07 00:01:12 UTC (rev 29742)
+++ scummvm/trunk/engines/lure/hotspots.cpp	2007-12-07 08:16:52 UTC (rev 29743)
@@ -986,6 +986,11 @@
 		hotspot->delayCtr = 30;
 		hotspot->actionHotspotId = _hotspotId;
 	}
+	
+	// If the player had called out to someone to wait, close down that talk dialog
+	if ((_hotspotId == PLAYER_ID) && (res.getTalkingCharacter() == PLAYER_ID)) 
+		Room::getReference().setTalkDialog(0, 0, 0, 0);
+
 	return PC_EXECUTE;
 }
 


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