[Scummvm-cvs-logs] CVS: scummvm/queen talk.cpp,1.2,1.3

Max Horn fingolfin at users.sourceforge.net
Tue Oct 7 02:43:19 CEST 2003


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

Modified Files:
	talk.cpp 
Log Message:
fixed warnings

Index: talk.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/talk.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- talk.cpp	7 Oct 2003 06:56:29 -0000	1.2
+++ talk.cpp	7 Oct 2003 09:34:19 -0000	1.3
@@ -97,7 +97,7 @@
 
 	// Lines 906-? in talk.c
 	// XXX drawmouseflag=1;
-	int16 level=1, retval=0, type=1;
+	int16 level=1, retval=0;
 	int16 head = _dialogueTree[level][0].head;
 
 	// TODO: split this loop in several functions
@@ -309,20 +309,20 @@
 
 	_uniqueKey            = (int16)READ_BE_UINT16(ptr); ptr += 2;
 	_talkKey              = (int16)READ_BE_UINT16(ptr); ptr += 2;
-	int16 jMax            = (int16)READ_BE_UINT16(ptr); ptr += 2;
+	/*int16 jMax            =*/ (int16)READ_BE_UINT16(ptr); ptr += 2;
 	_pMax                 = (int16)READ_BE_UINT16(ptr); ptr += 2;
-	int16 gameState1      = (int16)READ_BE_UINT16(ptr); ptr += 2;
-	int16 testValue1      = (int16)READ_BE_UINT16(ptr); ptr += 2;
-	int16 itemToInsert1   = (int16)READ_BE_UINT16(ptr); ptr += 2;
-	int16 gameState2      = (int16)READ_BE_UINT16(ptr); ptr += 2;
-	int16 testValue2      = (int16)READ_BE_UINT16(ptr); ptr += 2;
-	int16 itemToInsert2   = (int16)READ_BE_UINT16(ptr); ptr += 2;
+	/*int16 gameState1      =*/ (int16)READ_BE_UINT16(ptr); ptr += 2;
+	/*int16 testValue1      =*/ (int16)READ_BE_UINT16(ptr); ptr += 2;
+	/*int16 itemToInsert1   =*/ (int16)READ_BE_UINT16(ptr); ptr += 2;
+	/*int16 gameState2      =*/ (int16)READ_BE_UINT16(ptr); ptr += 2;
+	/*int16 testValue2      =*/ (int16)READ_BE_UINT16(ptr); ptr += 2;
+	/*int16 itemToInsert2   =*/ (int16)READ_BE_UINT16(ptr); ptr += 2;
 
 	//debug(0, "uniqueKey = %i", _uniqueKey);
 	//debug(0, "talkKey   = %i", _talkKey);
 
 	_person1Ptr      = _fileData + READ_BE_UINT16(ptr); ptr += 2;
-	byte *cutawayPtr = _fileData + READ_BE_UINT16(ptr); ptr += 2;
+	/*byte *cutawayPtr =*/ _fileData + READ_BE_UINT16(ptr); ptr += 2;
 	_person2Ptr      = _fileData + READ_BE_UINT16(ptr); ptr += 2;
 
 	if (ptr != (_fileData + 28))





More information about the Scummvm-git-logs mailing list