From 17a2f52ac68940677d96560c54f113b9e947e5bf Mon Sep 17 00:00:00 2001 From: Sven Hesse Date: Thu, 25 Jun 2009 18:53:36 +0000 Subject: [PATCH] Making _numDataChunks unsigned svn-id: r41875 --- engines/gob/dataio.cpp | 5 ++--- engines/gob/dataio.h | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/engines/gob/dataio.cpp b/engines/gob/dataio.cpp index 493da55f45d..f59fa80e8d6 100644 --- a/engines/gob/dataio.cpp +++ b/engines/gob/dataio.cpp @@ -239,7 +239,7 @@ int16 DataIO::getChunk(const char *chunkName) { } 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 @@ uint32 DataIO::getChunkPos(int16 handle) const { int32 DataIO::getChunkSize(const char *chunkName) { int16 file; - int16 chunk; struct ChunkDesc *dataDesc; int16 slot; int32 realSize; @@ -344,7 +343,7 @@ int32 DataIO::getChunkSize(const char *chunkName) { 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; diff --git a/engines/gob/dataio.h b/engines/gob/dataio.h index 6cdf1fc6d21..1f55cac90df 100644 --- a/engines/gob/dataio.h +++ b/engines/gob/dataio.h @@ -93,7 +93,7 @@ public: 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];