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

dreammaster at users.sourceforge.net dreammaster at users.sourceforge.net
Thu Nov 8 11:50:27 CET 2007


Revision: 29449
          http://scummvm.svn.sourceforge.net/scummvm/?rev=29449&view=rev
Author:   dreammaster
Date:     2007-11-08 02:50:26 -0800 (Thu, 08 Nov 2007)

Log Message:
-----------
Bugfix for approaching Ratpouch, and have him properly stand still until he's received instructions

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

Modified: scummvm/trunk/engines/lure/hotspots.cpp
===================================================================
--- scummvm/trunk/engines/lure/hotspots.cpp	2007-11-07 22:39:46 UTC (rev 29448)
+++ scummvm/trunk/engines/lure/hotspots.cpp	2007-11-08 10:50:26 UTC (rev 29449)
@@ -747,8 +747,9 @@
 		// in case the destination is already in process of talking
 		HotspotData *hotspot = Resources::getReference().getHotspot(destCharacterId);
 		_data->talkCountdown += hotspot->talkCountdown;
-		
-//		hotspot->talkerId = _hotspotId ;
+
+		if (hotspot->talkCountdown == 0)
+			hotspot->talkerId = _hotspotId ;
 		hotspot->talkGate = 0;
 	}
 
@@ -1559,7 +1560,7 @@
 		return;
 	}
 
-	converse(hotspot->hotspotId, 0x7C);
+	converse(hotspot->hotspotId, 0x7C, true);
 
 	uint16 sequenceOffset = res.getHotspotAction(hotspot->actionsOffset, TELL);
 	if (sequenceOffset >= 0x8000) {


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