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

David Eriksson twogood at users.sourceforge.net
Thu Oct 2 01:50:03 CEST 2003


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

Modified Files:
	logic.h logic.cpp 
Log Message:
More member data access.


Index: logic.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/logic.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- logic.h	2 Oct 2003 06:38:58 -0000	1.2
+++ logic.h	2 Oct 2003 08:49:38 -0000	1.3
@@ -32,11 +32,15 @@
 
 	uint16 currentRoom();
 	void currentRoom(uint16 room);
-  
-	int16* objectData(int index);
+
+	int16 *objectData(int index);
 	uint16 roomData(int room);
 	uint16 objMax(int room);
 
+	uint16 walkOffCount();
+	uint16 *walkOffData(int index);
+
+
 protected:
 	uint8 *_jas;
 	uint16 _numRooms;
@@ -48,7 +52,10 @@
 	uint16 _numDescriptions;
 	uint16 _numItems;
 	uint16 _numGraphics;
-	
+
+	uint16 _numObjectBoxes;
+	uint16 _numWalkOffs;
+
 	uint16 *_roomData;
 	uint16 *_sfxName;
 	uint16 *_objMax;
@@ -58,9 +65,11 @@
 	uint16 (*_graphicData)[5];
 	int16 (*_objectData)[8];
 	uint16 (*_actorData)[12];
-	
+
 	uint16 (*_area)[11][8];
-	
+
+	uint16 (*_walkOffData)[3];
+
 	QueenResource *_resource;
 
 	void initialise();

Index: logic.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/logic.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- logic.cpp	2 Oct 2003 06:38:58 -0000	1.6
+++ logic.cpp	2 Oct 2003 08:49:38 -0000	1.7
@@ -133,6 +133,7 @@
 
 */	
 
+	_numWalkOffs = 0;
 }
 
 uint16 QueenLogic::currentRoom() {
@@ -140,18 +141,28 @@
 }
 
 void QueenLogic::currentRoom(uint16 room) {
-  _currentRoom = room;
+	_currentRoom = room;
 }
 
 int16* QueenLogic::objectData(int index) {
-  return _objectData[index];
+	return _objectData[index];
 }
 
 uint16 QueenLogic::roomData(int room) {
-  return _roomData[room];
+	return _roomData[room];
 }
 
 uint16 QueenLogic::objMax(int room) {
-  return _objMax[room];
+	return _objMax[room];
 }
+
+uint16 QueenLogic::walkOffCount() {
+	return _numWalkOffs;
+}
+
+uint16 *QueenLogic::walkOffData(int index) {
+	return _walkOffData[index];
+}
+
+
 





More information about the Scummvm-git-logs mailing list