[Scummvm-cvs-logs] CVS: scummvm/queen logic.cpp,1.7,1.8 logic.h,1.3,1.4

[David Eriksson]

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

Modified Files:
	logic.cpp logic.h 
Log Message:
Needing area, and it must be signed ints

Index: logic.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/logic.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- logic.cpp	2 Oct 2003 08:49:38 -0000	1.7
+++ logic.cpp	2 Oct 2003 11:03:33 -0000	1.8
@@ -107,7 +107,7 @@
 	
 	_objMax = new uint16[_numRooms + 1];
 	_areaMax = new uint16[_numRooms + 1];
-	_area = new uint16[_numRooms + 1][11][8];
+	_area = new int16[_numRooms + 1][11][8];
 /*
 	for (uint16 i = 1; i < (_numRooms + 1); i++) {
 		_objMax[i] = READ_BE_UINT16(ptr);
@@ -144,6 +144,10 @@
 	_currentRoom = room;
 }
 
+void QueenLogic::oldRoom(uint16 room) {
+	_oldRoom = room;
+}
+
 int16* QueenLogic::objectData(int index) {
 	return _objectData[index];
 }
@@ -156,6 +160,10 @@
 	return _objMax[room];
 }
 
+int16 *QueenLogic::area(int index, int subIndex) {
+	return _area[index][subIndex];
+}
+
 uint16 QueenLogic::walkOffCount() {
 	return _numWalkOffs;
 }
@@ -163,6 +171,4 @@
 uint16 *QueenLogic::walkOffData(int index) {
 	return _walkOffData[index];
 }
-
-
 

Index: logic.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/logic.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- logic.h	2 Oct 2003 08:49:38 -0000	1.3
+++ logic.h	2 Oct 2003 11:03:34 -0000	1.4
@@ -33,10 +33,13 @@
 	uint16 currentRoom();
 	void currentRoom(uint16 room);
 
+	void oldRoom(uint16 room);
+
 	int16 *objectData(int index);
 	uint16 roomData(int room);
 	uint16 objMax(int room);
 
+	int16 *area(int index, int subIndex);
 	uint16 walkOffCount();
 	uint16 *walkOffData(int index);
 
@@ -66,7 +69,7 @@
 	int16 (*_objectData)[8];
 	uint16 (*_actorData)[12];
 
-	uint16 (*_area)[11][8];
+	int16 (*_area)[11][8];
 
 	uint16 (*_walkOffData)[3];