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

[dreammaster at users.sourceforge.net]

Revision: 26740
          http://scummvm.svn.sourceforge.net/scummvm/?rev=26740&view=rev
Author:   dreammaster
Date:     2007-05-02 22:06:10 -0700 (Wed, 02 May 2007)

Log Message:
-----------
Bugfix for characters freezing after talking when in a different room than the player, and fixed NPC to NPC conversations 

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

Modified: scummvm/trunk/engines/lure/hotspots.cpp
===================================================================
--- scummvm/trunk/engines/lure/hotspots.cpp	2007-05-03 02:39:33 UTC (rev 26739)
+++ scummvm/trunk/engines/lure/hotspots.cpp	2007-05-03 05:06:10 UTC (rev 26740)
@@ -780,7 +780,8 @@
 		// Talking is finish - stop talking and free voice animation
 		debugC(ERROR_DETAILED, kLureDebugAnimations, "Talk dialog close");
 		room.setTalkDialog(0, 0, 0, 0);
-		res.setTalkingCharacter(0);
+		_data->talkDestCharacterId = 0;
+		_data->talkGate = 0;
 	}
 
 	debugC(ERROR_DETAILED, kLureDebugAnimations, "Talk handler method end");
@@ -1924,7 +1925,7 @@
 	// Handle the source's talk message
 	if (entry.param(1) != 0) {
 		converse(hotspot->hotspotId, entry.param(1));
-		resource()->talkCountdown = entry.param(2);
+		resource()->talkCountdown += entry.param(2);
 		resource()->delayCtr = entry.param(2);
 	}
 

Modified: scummvm/trunk/engines/lure/luredefs.h
===================================================================
--- scummvm/trunk/engines/lure/luredefs.h	2007-05-03 02:39:33 UTC (rev 26739)
+++ scummvm/trunk/engines/lure/luredefs.h	2007-05-03 05:06:10 UTC (rev 26740)
@@ -85,16 +85,16 @@
 	BRIBE = 24,
 	EXAMINE = 25,
 	NPC_SET_ROOM_AND_OFFSET = 28, 
-	NPC_UNKNOWN1 = 29, 
+	NPC_TALK_TO_PLAYER = 29, 
 	NPC_EXEC_SCRIPT = 30, 
-	NPC_UNKNOWN2 = 31,
+	NPC_RESET_PAUSED_LIST = 31,
 	NPC_SET_RAND_DEST = 32, 
 	NPC_WALKING_CHECK = 33, 
 	NPC_SET_SUPPORT_OFFSET = 34,
 	NPC_SUPPORT_OFFSET_COND = 35, 
 	NPC_DISPATCH_ACTION = 36, 
-	NPC_UNKNOWN3 = 37,
-	NPC_UNKNOWN4 = 38, 
+	NPC_TALK_NPC_TO_NPC = 37,
+	NPC_PAUSE = 38, 
 	NPC_START_TALKING = 39, 
 	NPC_JUMP_ADDRESS = 40
 };


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