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

[dreammaster at users.sourceforge.net]

Revision: 29256
          http://scummvm.svn.sourceforge.net/scummvm/?rev=29256&view=rev
Author:   dreammaster
Date:     2007-10-25 03:37:23 -0700 (Thu, 25 Oct 2007)

Log Message:
-----------
Added saving of NPC direction, and bugfix for closing talk dialogs

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

Modified: scummvm/trunk/engines/lure/hotspots.cpp
===================================================================
--- scummvm/trunk/engines/lure/hotspots.cpp	2007-10-24 10:16:19 UTC (rev 29255)
+++ scummvm/trunk/engines/lure/hotspots.cpp	2007-10-25 10:37:23 UTC (rev 29256)
@@ -863,7 +863,7 @@
 			debugC(ERROR_DETAILED, kLureDebugAnimations, "Talk dialog close");
 			room.setTalkDialog(0, 0, 0, 0);
 
-			if (_data->talkDestCharacterId != 0) {
+			if ((_data->talkDestCharacterId != 0) && (_data->talkDestCharacterId != NOONE_ID)) {
 				HotspotData *destChar = res.getHotspot(_data->talkDestCharacterId);
 				destChar->talkerId = 0;
 			}
@@ -2155,6 +2155,7 @@
 	stream->writeUint16LE(_hotspotScriptOffset);
 	stream->writeUint16LE(_tickCtr);
 	stream->writeByte(_colourOffset);
+	stream->writeByte((byte)_direction);
 	stream->writeUint16LE(_animId);
 	stream->writeUint16LE(_frameNumber);
 
@@ -2195,6 +2196,7 @@
 	_hotspotScriptOffset = stream->readUint16LE();
 	_tickCtr = stream->readUint16LE();
 	_colourOffset = stream->readByte();
+	_direction = (Direction)stream->readByte();
 	setAnimation(stream->readUint16LE());
 	setFrameNumber(stream->readUint16LE());
 


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