[Scummvm-cvs-logs] CVS: scummvm/scumm resource_v4.cpp,1.15,1.16 resource_v7he.cpp,1.23,1.24

Torbjörn Andersson eriktorbjorn at users.sourceforge.net
Mon Apr 4 00:27:19 CEST 2005


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

Modified Files:
	resource_v4.cpp resource_v7he.cpp 
Log Message:
Fixed warnings on little-endian systems.


Index: resource_v4.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/resource_v4.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- resource_v4.cpp	4 Apr 2005 00:12:41 -0000	1.15
+++ resource_v4.cpp	4 Apr 2005 07:25:21 -0000	1.16
@@ -204,7 +204,6 @@
 }
 
 void ScummEngine_v7::readGlobalObjects() {
-	int i;
 	int num = _fileHandle->readUint16LE();
 	assert(num == _numGlobalObjects);
 
@@ -216,7 +215,7 @@
 
 #if defined(SCUMM_BIG_ENDIAN)
 	// Correct the endianess if necessary
-	for (i = 0; i != num; i++)
+	for (int i = 0; i != num; i++)
 		_classData[i] = FROM_LE_32(_classData[i]);
 #endif
 }

Index: resource_v7he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/resource_v7he.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- resource_v7he.cpp	3 Apr 2005 23:53:34 -0000	1.23
+++ resource_v7he.cpp	4 Apr 2005 07:25:21 -0000	1.24
@@ -1641,7 +1641,6 @@
 }
 
 void ScummEngine_v70he::readGlobalObjects() {
-	int i;
 	int num = _fileHandle->readUint16LE();
 	assert(num == _numGlobalObjects);
 
@@ -1653,7 +1652,7 @@
 
 #if defined(SCUMM_BIG_ENDIAN)
 	// Correct the endianess if necessary
-	for (i = 0; i != num; i++)
+	for (int i = 0; i != num; i++)
 		_classData[i] = FROM_LE_32(_classData[i]);
 #endif
 }





More information about the Scummvm-git-logs mailing list