diff options
| author | Max Horn | 2005-01-09 15:36:54 +0000 |
|---|---|---|
| committer | Max Horn | 2005-01-09 15:36:54 +0000 |
| commit | dd9335b232de2e937905773b2c795423eb052a4f (patch) | |
| tree | a37c9ee3c3465a6f3de59e401bf1e51a405eef2c /saga | |
| parent | f3b8221dd6a06f486a15aeedfd26d054a9287a18 (diff) | |
| download | scummvm-rg350-dd9335b232de2e937905773b2c795423eb052a4f.tar.gz scummvm-rg350-dd9335b232de2e937905773b2c795423eb052a4f.tar.bz2 scummvm-rg350-dd9335b232de2e937905773b2c795423eb052a4f.zip | |
fix warning
svn-id: r16498
Diffstat (limited to 'saga')
| -rw-r--r-- | saga/sprite.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/saga/sprite.cpp b/saga/sprite.cpp index 74fc020492..d21ede5656 100644 --- a/saga/sprite.cpp +++ b/saga/sprite.cpp @@ -118,22 +118,22 @@ int Sprite::loadList(int resourceId, SpriteList &spriteList) { spritePointer = spriteListData; spritePointer += offset; - MemoryReadStream readS(spritePointer, (_vm->_features & GF_MAC_RESOURCES) ? 8 : 4); + MemoryReadStream readS2(spritePointer, (_vm->_features & GF_MAC_RESOURCES) ? 8 : 4); if (!(_vm->_features & GF_MAC_RESOURCES)) { - spriteInfo->xAlign = readS.readSByte(); - spriteInfo->yAlign = readS.readSByte(); + spriteInfo->xAlign = readS2.readSByte(); + spriteInfo->yAlign = readS2.readSByte(); - spriteInfo->width = readS.readByte(); - spriteInfo->height = readS.readByte(); + spriteInfo->width = readS2.readByte(); + spriteInfo->height = readS2.readByte(); } else { - spriteInfo->xAlign = readS.readSint16BE(); - spriteInfo->yAlign = readS.readSint16BE(); + spriteInfo->xAlign = readS2.readSint16BE(); + spriteInfo->yAlign = readS2.readSint16BE(); - spriteInfo->width = readS.readUint16BE(); - spriteInfo->height = readS.readUint16BE(); + spriteInfo->width = readS2.readUint16BE(); + spriteInfo->height = readS2.readUint16BE(); } - spriteDataPointer = spritePointer + readS.pos(); + spriteDataPointer = spritePointer + readS2.pos(); outputLength = spriteInfo->width * spriteInfo->height; decodeRLEBuffer(spriteDataPointer, 64000, outputLength); //todo: 64000 - should be replace by real input length spriteInfo->decodedBuffer = (byte *) malloc(outputLength); |