[Scummvm-cvs-logs] CVS: scummvm/queen logic.h,1.1,1.2 logic.cpp,1.5,1.6

[David Eriksson]

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

Modified Files:
	logic.h logic.cpp 
Log Message:
Must be able to access some data here.


Index: logic.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/logic.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- logic.h	28 Sep 2003 15:48:54 -0000	1.1
+++ logic.h	2 Oct 2003 06:38:58 -0000	1.2
@@ -29,7 +29,13 @@
 public:
 	QueenLogic(QueenResource *resource);
 	~QueenLogic();
+
 	uint16 currentRoom();
+	void currentRoom(uint16 room);
+  
+	int16* objectData(int index);
+	uint16 roomData(int room);
+	uint16 objMax(int room);
 
 protected:
 	uint8 *_jas;
@@ -50,7 +56,7 @@
 	uint16 (*_objectBox)[4];
 	uint16 (*_itemData)[5];
 	uint16 (*_graphicData)[5];
-	uint16 (*_objectData)[8];
+	int16 (*_objectData)[8];
 	uint16 (*_actorData)[12];
 	
 	uint16 (*_area)[11][8];

Index: logic.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/logic.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- logic.cpp	29 Sep 2003 22:30:02 -0000	1.5
+++ logic.cpp	2 Oct 2003 06:38:58 -0000	1.6
@@ -49,7 +49,7 @@
 	
 
 	//Object data
-	_objectData = new uint16[_numObjects + 1][8];
+	_objectData = new int16[_numObjects + 1][8];
 		
 	//clear first object
 	for (uint16 j = 0; j < 8; j++)
@@ -57,7 +57,7 @@
 	
 	for (i = 1; i < (_numObjects + 1); i++)
 		for (uint16 j = 0; j < 8; j++) {
-			_objectData[i][j] = READ_BE_UINT16(ptr);
+			_objectData[i][j] = (int16)READ_BE_UINT16(ptr);
 			ptr += 2;
 		}
 	
@@ -137,5 +137,21 @@
 
 uint16 QueenLogic::currentRoom() {
 	return _currentRoom;
+}
+
+void QueenLogic::currentRoom(uint16 room) {
+  _currentRoom = room;
+}
+
+int16* QueenLogic::objectData(int index) {
+  return _objectData[index];
+}
+
+uint16 QueenLogic::roomData(int room) {
+  return _roomData[room];
+}
+
+uint16 QueenLogic::objMax(int room) {
+  return _objMax[room];
 }