[Scummvm-cvs-logs] CVS: scummvm/queen structs.h,1.2,1.3 logic.cpp,1.23,1.24

[Gregory Montoir]

Update of /cvsroot/scummvm/scummvm/queen
In directory sc8-pr-cvs1:/tmp/cvs-serv17337

Modified Files:
	structs.h logic.cpp 
Log Message:
added new structures

Index: structs.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/structs.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- structs.h	6 Oct 2003 13:20:29 -0000	1.2
+++ structs.h	8 Oct 2003 08:55:05 -0000	1.3
@@ -58,7 +58,7 @@
 
 
 struct ObjectData {
-	int16 name;
+	int16 name; // FIXME: rename to 'object'
 	uint16 x;
 	uint16 y;
 	uint16 description;
@@ -70,15 +70,15 @@
 
 
 struct ObjectDescription {
-	uint16 field1;
-	uint16 field2;
-	uint16 field3;
-	uint16 field4;
+	uint16 object;
+	uint16 type; // see select.c l.75-101
+	uint16 lastDescription;
+	uint16 seenCount;
 };
 
 
 struct ItemData {
-	int16 name;
+	int16 item;
 	int16 description;
 	int16 state;
 	uint16 bobFrame;
@@ -90,8 +90,8 @@
 	int16 room;
 	int16 bobNum;
 	uint16 name;
-	uint16 gameStateSlot;
-	uint16 gameStateValue;
+	int16 gameStateSlot;
+	int16 gameStateValue;
 	uint16 color;
 	uint16 bobFrameStanding;
 	uint16 x;
@@ -99,6 +99,61 @@
 	uint16 anim;
 	uint16 bankNum;
 	uint16 actorFile;
+};
+
+
+struct CmdListData {
+	int16 verb;
+	int16 nounObj1;
+	int16 nounObj2;
+	bool setAreas;
+	bool setObjects;
+	bool setItems;
+	bool setConditions;
+	int16 image;
+	int16 specialSection; // see execute.c l.423-451
+};
+
+
+struct CmdArea {
+	int16 id;
+	int16 area; // <0: turn off, >0: turn on
+	int16 room;
+};
+
+
+struct CmdObject {
+	int16 id;
+	int16 dstObj; // >0: show, <0: hide
+	int16 srcObj; // >0: copy from srcObj, -1: delete dstObj
+};
+
+
+struct CmdInventory {
+	int16 id;
+	int16 dstItem; // <0 : delete, >0 : add
+	int16 srcItem; // >0 : valid
+};
+
+
+struct CmdGameState {
+	int16 id;
+	int16 gameStateSlot;
+	int16 gameStateValue;
+	int16 speakValue;
+};
+
+
+struct FurnitureData {
+	int16 room;
+	int16 gameStateValue;
+};
+
+
+struct GraphicAnim {
+	int16 frame1;
+	int16 frame2;
+	int16 frame3;
 };
 
 

Index: logic.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/logic.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- logic.cpp	7 Oct 2003 08:22:53 -0000	1.23
+++ logic.cpp	8 Oct 2003 08:55:07 -0000	1.24
@@ -107,10 +107,10 @@
 	_numItems = READ_BE_UINT16(ptr);
 	ptr += 2;
 
-	_itemData = new ItemData[_numItems + 1];	
+	_itemData = new ItemData[_numItems + 1];
 
 	for (i = 1; i <= _numItems; i++) {
-		_itemData[i].name = (int16)READ_BE_UINT16(ptr);
+		_itemData[i].item = (int16)READ_BE_UINT16(ptr);
 		ptr += 2;
 		_itemData[i].description = (int16)READ_BE_UINT16(ptr);
 		ptr += 2;
@@ -194,13 +194,13 @@
 
 	_objectDescription = new ObjectDescription[_numObjDesc + 1];
 	for (i = 1; i <= _numObjDesc; i++) {
-		_objectDescription[i].field1 = READ_BE_UINT16(ptr);
+		_objectDescription[i].object = READ_BE_UINT16(ptr);
 		ptr += 2;
-		_objectDescription[i].field2 = READ_BE_UINT16(ptr);
+		_objectDescription[i].type = READ_BE_UINT16(ptr);
 		ptr += 2;
-		_objectDescription[i].field3 = READ_BE_UINT16(ptr);
+		_objectDescription[i].lastDescription = READ_BE_UINT16(ptr);
 		ptr += 2;
-		_objectDescription[i].field4 = READ_BE_UINT16(ptr);
+		_objectDescription[i].seenCount = READ_BE_UINT16(ptr);
 		ptr += 2;
 	}