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

[dreammaster at users.sourceforge.net]

Revision: 25888
          http://scummvm.svn.sourceforge.net/scummvm/?rev=25888&view=rev
Author:   dreammaster
Date:     2007-02-26 14:56:02 -0800 (Mon, 26 Feb 2007)

Log Message:
-----------
Added animation handler for standard characters that can be talked to

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

Modified: scummvm/trunk/engines/lure/hotspots.cpp
===================================================================
--- scummvm/trunk/engines/lure/hotspots.cpp	2007-02-26 22:38:24 UTC (rev 25887)
+++ scummvm/trunk/engines/lure/hotspots.cpp	2007-02-26 22:56:02 UTC (rev 25888)
@@ -1966,8 +1966,6 @@
 		return voiceBubbleAnimHandler;
 	case PUZZLED_TICK_PROC_ID:
 		return puzzledAnimHandler;
-	case 0x7F3A:
-		return standardAnimHandler;
 	case 0x7207:
 		return roomExitAnimHandler;
 	case PLAYER_TICK_PROC_ID:
@@ -1976,6 +1974,10 @@
 		return followerAnimHandler;
 	case 0x7EFA:
 		return skorlAnimHandler;
+	case 0x7F37:
+		return standardAnimHandler2;
+	case 0x7F3A:
+		return standardAnimHandler;
 	case 0x7F69:
 		return droppingTorchAnimHandler;
 	case 0x7FA1:
@@ -2008,6 +2010,11 @@
 		h.executeScript();
 }
 
+void HotspotTickHandlers::standardAnimHandler2(Hotspot &h) {
+	h.handleTalkDialog();
+	standardCharacterAnimHandler(h);
+}
+
 void HotspotTickHandlers::standardCharacterAnimHandler(Hotspot &h) {
 	Resources &res = Resources::getReference();
 	ValueTableData &fields = res.fieldList();

Modified: scummvm/trunk/engines/lure/hotspots.h
===================================================================
--- scummvm/trunk/engines/lure/hotspots.h	2007-02-26 22:38:24 UTC (rev 25887)
+++ scummvm/trunk/engines/lure/hotspots.h	2007-02-26 22:56:02 UTC (rev 25888)
@@ -58,6 +58,7 @@
 	static void defaultHandler(Hotspot &h);
 	static void voiceBubbleAnimHandler(Hotspot &h);
 	static void standardAnimHandler(Hotspot &h);
+	static void standardAnimHandler2(Hotspot &h);
 	static void standardCharacterAnimHandler(Hotspot &h);
 	static void puzzledAnimHandler(Hotspot &h);
 	static void roomExitAnimHandler(Hotspot &h);


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