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

dreammaster at users.sourceforge.net dreammaster at users.sourceforge.net
Fri Feb 9 11:58:07 CET 2007


Revision: 25441
          http://scummvm.svn.sourceforge.net/scummvm/?rev=25441&view=rev
Author:   dreammaster
Date:     2007-02-09 02:58:06 -0800 (Fri, 09 Feb 2007)

Log Message:
-----------
Added new flag for blocked characters and extra checking of dynamic support records versus static schedule entry records

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

Modified: scummvm/trunk/engines/lure/res_struct.cpp
===================================================================
--- scummvm/trunk/engines/lure/res_struct.cpp	2007-02-09 10:56:31 UTC (rev 25440)
+++ scummvm/trunk/engines/lure/res_struct.cpp	2007-02-09 10:58:06 UTC (rev 25441)
@@ -303,6 +303,7 @@
 	// Initialise runtime fields
 	actionCtr = 0;
 	blockedState = BS_NONE;
+	blockedFlag = false;
 	coveredFlag = VB_INITIAL;
 	talkMessageId = 0;
 	talkDestCharacterId = 0;
@@ -340,6 +341,7 @@
 	// Write out the runtime fields
 	stream->writeUint16LE(actionCtr);
 	stream->writeUint16LE(blockedState);
+	stream->writeByte((byte)blockedFlag);
 	stream->writeByte((byte)coveredFlag);
 	stream->writeUint16LE(talkMessageId);
 	stream->writeUint16LE(talkDestCharacterId);
@@ -378,6 +380,7 @@
 	// Read in the runtime fields
 	actionCtr = stream->readUint16LE();
 	blockedState = (BlockedState)stream->readUint16LE();
+	blockedFlag = stream->readByte() != 0;
 	coveredFlag = (VariantBool)stream->readByte();
 	talkMessageId = stream->readUint16LE();
 	talkDestCharacterId = stream->readUint16LE();
@@ -705,7 +708,7 @@
 }
 
 uint16 CharacterScheduleEntry::id() {
-	return parent()->getId(this);
+	return (_parent == NULL) ? NULL : _parent->getId(this);
 }
 
 CharacterScheduleSet::CharacterScheduleSet(CharacterScheduleResource *rec, uint16 setId) {

Modified: scummvm/trunk/engines/lure/res_struct.h
===================================================================
--- scummvm/trunk/engines/lure/res_struct.h	2007-02-09 10:56:31 UTC (rev 25440)
+++ scummvm/trunk/engines/lure/res_struct.h	2007-02-09 10:58:06 UTC (rev 25441)
@@ -428,6 +428,7 @@
 	// Runtime fields
 	uint16 actionCtr;
 	BlockedState blockedState;
+	bool blockedFlag;
 	VariantBool coveredFlag;
 	uint16 talkMessageId;
 	uint16 talkDestCharacterId;


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