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

Jamieson Christian jamieson630 at users.sourceforge.net
Sun Sep 28 18:49:02 CEST 2003


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

Modified Files:
	logic.cpp 
Log Message:
Fixed MSVC6 errors

Index: logic.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/logic.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- logic.cpp	28 Sep 2003 19:57:01 -0000	1.2
+++ logic.cpp	29 Sep 2003 01:48:13 -0000	1.3
@@ -34,6 +34,7 @@
 }
 
 void QueenLogic::initialise() {
+	uint16 i;
 	uint8 *ptr = _jas;
 
 	//_display->loadFont();
@@ -55,7 +56,7 @@
 	for (uint16 j = 0; j < 8; j++)
 		_objectData[0][j] = 0;
 	
-	for (uint16 i = 1; i < (_numObjects + 1); i++)
+	for (i = 1; i < (_numObjects + 1); i++)
 		for (uint16 j = 0; j < 8; j++) {
 			_objectData[i][j] = READ_BE_UINT16(ptr);
 			ptr += 2;
@@ -63,7 +64,7 @@
 	
 	//Room data
 	_roomData = new uint16[_numRooms + 2];
-	for (uint16 i = 1; i < (_numRooms + 2); i++) {
+	for (i = 1; i < (_numRooms + 2); i++) {
 		_roomData[i] = READ_BE_UINT16(ptr);
 		ptr += 2;
 	}
@@ -72,7 +73,7 @@
 
 	//SFX Name
 	_sfxName = new uint16[_numRooms + 1];
-	for (uint16 i = 0; i < (_numRooms + 1); i++) {
+	for (i = 0; i < (_numRooms + 1); i++) {
 		_sfxName[i] = READ_BE_UINT16(ptr);
 		ptr += 2;
 	}	
@@ -83,7 +84,7 @@
 
 	_itemData = new uint16[_numItems + 1][5];
 	
-	for (uint16 i = 1; i < (_numItems + 1); i++) {
+	for (i = 1; i < (_numItems + 1); i++) {
 		_itemData[i][0] = READ_BE_UINT16(ptr);
 		ptr += 2;
 		for (uint16 j = 1; j < 5; j++) {
@@ -99,7 +100,7 @@
 
 	_graphicData = new uint16[_numGraphics + 1][5];
 
-	for (uint16 i = 1; i < _numGraphics; i++)
+	for (i = 1; i < _numGraphics; i++)
 		for (uint16 j = 0; j < 5; j++) {
 			_graphicData[i][j] = READ_BE_UINT16(ptr);
 			ptr += 2;





More information about the Scummvm-git-logs mailing list