diff options
| author | Paweł Kołodziejski | 2007-04-15 15:40:24 +0000 |
|---|---|---|
| committer | Paweł Kołodziejski | 2007-04-15 15:40:24 +0000 |
| commit | ae7c6406712dcc5f3567caaab9b2f95c379c9c10 (patch) | |
| tree | e0223e8113964b9dbf51198ead8dfbf850cbe1e2 /engines/scumm | |
| parent | ac7b134565b351d1b8d5e100e964cd35788387c9 (diff) | |
| download | scummvm-rg350-ae7c6406712dcc5f3567caaab9b2f95c379c9c10.tar.gz scummvm-rg350-ae7c6406712dcc5f3567caaab9b2f95c379c9c10.tar.bz2 scummvm-rg350-ae7c6406712dcc5f3567caaab9b2f95c379c9c10.zip | |
fixed warnings
svn-id: r26506
Diffstat (limited to 'engines/scumm')
| -rw-r--r-- | engines/scumm/resource_v2.cpp | 8 | ||||
| -rw-r--r-- | engines/scumm/resource_v3.cpp | 2 | ||||
| -rw-r--r-- | engines/scumm/sound.cpp | 6 |
3 files changed, 8 insertions, 8 deletions
diff --git a/engines/scumm/resource_v2.cpp b/engines/scumm/resource_v2.cpp index 08393da708..6a4f1ea30b 100644 --- a/engines/scumm/resource_v2.cpp +++ b/engines/scumm/resource_v2.cpp @@ -93,7 +93,7 @@ void ScummEngine_v2::readClassicIndexFile() { for (i = 0; i < _numRooms; i++) { _res->roomoffs[rtRoom][i] = _fileHandle->readUint16LE(); if (_res->roomoffs[rtRoom][i] == 0xFFFF) - _res->roomoffs[rtRoom][i] = RES_INVALID_OFFSET; + _res->roomoffs[rtRoom][i] = (uint32)RES_INVALID_OFFSET; } for (i = 0; i < _numCostumes; i++) { @@ -102,7 +102,7 @@ void ScummEngine_v2::readClassicIndexFile() { for (i = 0; i < _numCostumes; i++) { _res->roomoffs[rtCostume][i] = _fileHandle->readUint16LE(); if (_res->roomoffs[rtCostume][i] == 0xFFFF) - _res->roomoffs[rtCostume][i] = RES_INVALID_OFFSET; + _res->roomoffs[rtCostume][i] = (uint32)RES_INVALID_OFFSET; } for (i = 0; i < _numScripts; i++) { @@ -111,7 +111,7 @@ void ScummEngine_v2::readClassicIndexFile() { for (i = 0; i < _numScripts; i++) { _res->roomoffs[rtScript][i] = _fileHandle->readUint16LE(); if (_res->roomoffs[rtScript][i] == 0xFFFF) - _res->roomoffs[rtScript][i] = RES_INVALID_OFFSET; + _res->roomoffs[rtScript][i] = (uint32)RES_INVALID_OFFSET; } for (i = 0; i < _numSounds; i++) { @@ -120,7 +120,7 @@ void ScummEngine_v2::readClassicIndexFile() { for (i = 0; i < _numSounds; i++) { _res->roomoffs[rtSound][i] = _fileHandle->readUint16LE(); if (_res->roomoffs[rtSound][i] == 0xFFFF) - _res->roomoffs[rtSound][i] = RES_INVALID_OFFSET; + _res->roomoffs[rtSound][i] = (uint32)RES_INVALID_OFFSET; } } diff --git a/engines/scumm/resource_v3.cpp b/engines/scumm/resource_v3.cpp index 1ac159c9a5..2a4add52f3 100644 --- a/engines/scumm/resource_v3.cpp +++ b/engines/scumm/resource_v3.cpp @@ -54,7 +54,7 @@ void ScummEngine_v3old::readResTypeList(int id) { for (i = 0; i < num; i++) { _res->roomoffs[id][i] = _fileHandle->readUint16LE(); if (_res->roomoffs[id][i] == 0xFFFF) - _res->roomoffs[id][i] = RES_INVALID_OFFSET; + _res->roomoffs[id][i] = (uint32)RES_INVALID_OFFSET; } } diff --git a/engines/scumm/sound.cpp b/engines/scumm/sound.cpp index 9f29418ca6..c54eb25db5 100644 --- a/engines/scumm/sound.cpp +++ b/engines/scumm/sound.cpp @@ -1221,7 +1221,7 @@ int ScummEngine::readSoundResource(int type, int idx) { debugC(DEBUG_SOUND, "FMUS file %s", buffer); if (dmuFile.open(buffer) == false) { error("Can't open music file %s*", buffer); - _res->roomoffs[type][idx] = RES_INVALID_OFFSET; + _res->roomoffs[type][idx] = (uint32)RES_INVALID_OFFSET; return 0; } dmuFile.seek(4, SEEK_SET); @@ -1245,7 +1245,7 @@ int ScummEngine::readSoundResource(int type, int idx) { } error("Unrecognized base tag 0x%08x in sound %d", basetag, idx); } - _res->roomoffs[type][idx] = RES_INVALID_OFFSET; + _res->roomoffs[type][idx] = (uint32)RES_INVALID_OFFSET; return 0; } @@ -2107,7 +2107,7 @@ int ScummEngine::readSoundResourceSmallHeader(int type, int idx) { _fileHandle->read(_res->createResource(type, idx, ro_size - 4), ro_size - 4); return 1; } - _res->roomoffs[type][idx] = RES_INVALID_OFFSET; + _res->roomoffs[type][idx] = (uint32)RES_INVALID_OFFSET; return 0; } |