[Scummvm-cvs-logs] CVS: scummvm/queen logic.cpp,1.209,1.210 logic.h,1.120,1.121 queen.cpp,1.96,1.97

[Gregory Montoir]

Update of /cvsroot/scummvm/scummvm/queen
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5163/queen

Modified Files:
	logic.cpp logic.h queen.cpp 
Log Message:
sync queen engine with latest OSystem changes

Index: logic.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/logic.cpp,v
retrieving revision 1.209
retrieving revision 1.210
diff -u -d -r1.209 -r1.210
--- logic.cpp	18 Oct 2004 19:15:00 -0000	1.209
+++ logic.cpp	23 Nov 2004 21:51:26 -0000	1.210
@@ -58,14 +58,15 @@
 }
 
 Logic::Logic(QueenEngine *vm)
-	: _credits(NULL), _vm(vm) {
+	: _credits(NULL), _objectData(NULL), _roomData(NULL), _sfxName(NULL), 
+	_itemData(NULL), _graphicData(NULL), _walkOffData(NULL), _objectDescription(NULL),
+	_furnitureData(NULL), _actorData(NULL), _graphicAnim(NULL), _vm(vm) {
 	_joe.x = _joe.y = 0;
 	_joe.scale = 100;
 	_joe.walk = JWM_NORMAL;
 	memset(_gameState, 0, sizeof(_gameState));
 	memset(_talkSelected, 0, sizeof(_talkSelected));
 	_puzzleAttemptCount = 0;
-	initialise();
 	_journal = new Journal(vm);
 }
 
@@ -84,7 +85,7 @@
 	delete[] _graphicAnim;
 }
 
-void Logic::initialise() {	
+void Logic::start() {	
 	int16 i;
 
 	uint8 *jas = _vm->resource()->loadFile("QUEEN.JAS", 20);
@@ -929,24 +930,24 @@
 	}
 }
 
-int16 Logic::previousInventoryItem(int16 start) const {
+int16 Logic::previousInventoryItem(int16 first) const {
 	int i;
-	for (i = start - 1; i >= 1; i--)
+	for (i = first - 1; i >= 1; i--)
 		if (_itemData[i].name > 0)
 			return i;
-	for (i = _numItems; i > start; i--)
+	for (i = _numItems; i > first; i--)
 		if (_itemData[i].name > 0)
 			return i;
 
 	return 0;	//nothing found
 }
 
-int16 Logic::nextInventoryItem(int16 start) const {
+int16 Logic::nextInventoryItem(int16 first) const {
 	int i;
-	for (i = start + 1; i < _numItems; i++)
+	for (i = first + 1; i < _numItems; i++)
 		if (_itemData[i].name > 0)
 			return i;
-	for (i = 1; i < start; i++)
+	for (i = 1; i < first; i++)
 		if (_itemData[i].name > 0)
 			return i;
 

Index: logic.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/logic.h,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -d -r1.120 -r1.121
--- logic.h	17 Oct 2004 19:00:09 -0000	1.120
+++ logic.h	23 Nov 2004 21:51:30 -0000	1.121
@@ -155,8 +155,8 @@
 	void inventorySetup();
 	uint16 findInventoryItem(int invSlot) const;
 	void inventoryRefresh();
-	int16 previousInventoryItem(int16 start) const;
-	int16 nextInventoryItem(int16 start) const;
+	int16 previousInventoryItem(int16 first) const;
+	int16 nextInventoryItem(int16 first) const;
 	void removeDuplicateItems();
 	uint16 numItemsInventory() const;
 	void inventoryInsertItem(uint16 itemNum, bool refresh = true);
@@ -196,6 +196,8 @@
 	void startCredits(const char *filename);
 	void stopCredits();
 
+	void start();
+
 	enum {
 		JOE_RESPONSE_MAX    = 40,
 		DEFAULT_TALK_SPEED  = 7 * 3,
@@ -205,8 +207,6 @@
 
 protected:
 
-	void initialise();
-
 	void asmMakeJoeUseDress();
 	void asmMakeJoeUseNormalClothes();
 	void asmMakeJoeUseUnderwear();

Index: queen.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/queen.cpp,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -d -r1.96 -r1.97
--- queen.cpp	23 Nov 2004 00:03:20 -0000	1.96
+++ queen.cpp	23 Nov 2004 21:51:30 -0000	1.97
@@ -289,6 +289,7 @@
 }
 
 int QueenEngine::go() {
+	_logic->start();
 	_logic->oldRoom(0);
 	_logic->newRoom(_logic->currentRoom());