[Scummvm-cvs-logs] SF.net SVN: scummvm:[41875] scummvm/trunk/engines/gob

[drmccoy at users.sourceforge.net]

Revision: 41875
          http://scummvm.svn.sourceforge.net/scummvm/?rev=41875&view=rev
Author:   drmccoy
Date:     2009-06-25 18:53:36 +0000 (Thu, 25 Jun 2009)

Log Message:
-----------
Making _numDataChunks unsigned

Modified Paths:
--------------
    scummvm/trunk/engines/gob/dataio.cpp
    scummvm/trunk/engines/gob/dataio.h

Modified: scummvm/trunk/engines/gob/dataio.cpp
===================================================================
--- scummvm/trunk/engines/gob/dataio.cpp	2009-06-25 18:06:35 UTC (rev 41874)
+++ scummvm/trunk/engines/gob/dataio.cpp	2009-06-25 18:53:36 UTC (rev 41875)
@@ -239,7 +239,7 @@
 		}
 
 		dataDesc = _dataFiles[file];
-		for (int16 chunk = 0; chunk < _numDataChunks[file]; chunk++, dataDesc++) {
+		for (uint16 chunk = 0; chunk < _numDataChunks[file]; chunk++, dataDesc++) {
 			if (scumm_stricmp(chunkName, dataDesc->chunkName) != 0)
 				continue;
 
@@ -334,7 +334,6 @@
 
 int32 DataIO::getChunkSize(const char *chunkName) {
 	int16 file;
-	int16 chunk;
 	struct ChunkDesc *dataDesc;
 	int16 slot;
 	int32 realSize;
@@ -344,7 +343,7 @@
 			return -1;
 
 		dataDesc = _dataFiles[file];
-		for (chunk = 0; chunk < _numDataChunks[file]; chunk++, dataDesc++) {
+		for (uint16 chunk = 0; chunk < _numDataChunks[file]; chunk++, dataDesc++) {
 			if (scumm_stricmp(chunkName, dataDesc->chunkName) != 0)
 				continue;
 

Modified: scummvm/trunk/engines/gob/dataio.h
===================================================================
--- scummvm/trunk/engines/gob/dataio.h	2009-06-25 18:06:35 UTC (rev 41874)
+++ scummvm/trunk/engines/gob/dataio.h	2009-06-25 18:53:36 UTC (rev 41875)
@@ -93,7 +93,7 @@
 protected:
 	Common::File _filesHandles[MAX_FILES];
 	struct ChunkDesc *_dataFiles[MAX_DATA_FILES];
-	int16 _numDataChunks[MAX_DATA_FILES];
+	uint16 _numDataChunks[MAX_DATA_FILES];
 	int16 _dataFileHandles[MAX_DATA_FILES];
 	bool _dataFileItk[MAX_DATA_FILES];
 	int32 _chunkPos[MAX_SLOT_COUNT * MAX_DATA_FILES];


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.