Needing area, and it must be signed ints

svn-id: r10535

2 files changed, 13 insertions, 4 deletions

diff --git a/queen/logic.cpp b/queen/logic.cpp
index 7716ea69ad..8fb8b413be 100644
--- a/queen/logic.cpp
+++ b/queen/logic.cpp
@@ -107,7 +107,7 @@ void QueenLogic::initialise() {
 	
 	_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 @@ void QueenLogic::currentRoom(uint16 room) {
 	_currentRoom = room;
 }
 
+void QueenLogic::oldRoom(uint16 room) {
+	_oldRoom = room;
+}
+
 int16* QueenLogic::objectData(int index) {
 	return _objectData[index];
 }
@@ -156,6 +160,10 @@ uint16 QueenLogic::objMax(int room) {
 	return _objMax[room];
 }
 
+int16 *QueenLogic::area(int index, int subIndex) {
+	return _area[index][subIndex];
+}
+
 uint16 QueenLogic::walkOffCount() {
 	return _numWalkOffs;
 }
@@ -164,5 +172,3 @@ uint16 *QueenLogic::walkOffData(int index) {
 	return _walkOffData[index];
 }
 
-
-
diff --git a/queen/logic.h b/queen/logic.h
index 2d01b63902..db6d93cc1c 100644
--- a/queen/logic.h
+++ b/queen/logic.h
@@ -33,10 +33,13 @@ public:
 	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 @@ protected:
 	int16 (*_objectData)[8];
 	uint16 (*_actorData)[12];
 
-	uint16 (*_area)[11][8];
+	int16 (*_area)[11][8];
 
 	uint16 (*_walkOffData)[3];