diff options
| author | Torbjörn Andersson | 2005-10-11 06:08:42 +0000 |
|---|---|---|
| committer | Torbjörn Andersson | 2005-10-11 06:08:42 +0000 |
| commit | 2a562aa8ad4ba6d869d3b616bc25ff1d0de26f7c (patch) | |
| tree | 68c776319cf9ea109a6d0eeb13fb6fddfe5564de /saga | |
| parent | 618a50cec0f055b7ac2b79ca99a087bbcd46eecd (diff) | |
| download | scummvm-rg350-2a562aa8ad4ba6d869d3b616bc25ff1d0de26f7c.tar.gz scummvm-rg350-2a562aa8ad4ba6d869d3b616bc25ff1d0de26f7c.tar.bz2 scummvm-rg350-2a562aa8ad4ba6d869d3b616bc25ff1d0de26f7c.zip | |
I was going to fix the IHNM sprite loader, but when I got here this morning
sev had already done that. All that was left for me was this final bit of
cleanup. :-)
svn-id: r19014
Diffstat (limited to 'saga')
| -rw-r--r-- | saga/game.cpp | 2 | ||||
| -rw-r--r-- | saga/sprite.cpp | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/saga/game.cpp b/saga/game.cpp index 53c7da43c5..b82aed65c3 100644 --- a/saga/game.cpp +++ b/saga/game.cpp @@ -529,7 +529,7 @@ static PanelButton IHNM_MainPanelButtons[] = { {kPanelButtonVerb, 106,44, 114,30, kVerbLookAt,'l',0, 2,3,0}, {kPanelButtonVerb, 106,76, 114,30, kVerbTake,'k',0, 4,5,0}, {kPanelButtonVerb, 106,108, 114,30, kVerbUse,'u',0, 6,7,0}, - {kPanelButtonVerb, 223,12, 114,30, kVerbTalkTo,'t',0, 8,9,0}, // TODO: Find the sprites for the remaining buttons + {kPanelButtonVerb, 223,12, 114,30, kVerbTalkTo,'t',0, 8,9,0}, {kPanelButtonVerb, 223,44, 114,30, kVerbSwallow,'s',0, 10,11,0}, {kPanelButtonVerb, 223,76, 114,30, kVerbGive,'g',0, 12,13,0}, {kPanelButtonVerb, 223,108, 114,30, kVerbPush,'p',0, 14,15,0}, diff --git a/saga/sprite.cpp b/saga/sprite.cpp index 633d9cd91c..4b8d46fbd0 100644 --- a/saga/sprite.cpp +++ b/saga/sprite.cpp @@ -101,11 +101,11 @@ void Sprite::loadList(int resourceId, SpriteList &spriteList) { spriteList.spriteCount = newSpriteCount; + bool bigHeader = _vm->getGameType() != GType_ITE || _vm->isMacResources(); + for (i = oldSpriteCount; i < spriteList.spriteCount; i++) { spriteInfo = &spriteList.infoList[i]; - if (_vm->getGameType() == GType_IHNM) - offset = readS.readUint32(); - else if (_vm->isMacResources()) + if (bigHeader) offset = readS.readUint32(); else offset = readS.readUint16(); @@ -117,8 +117,8 @@ void Sprite::loadList(int resourceId, SpriteList &spriteList) { spritePointer = spriteListData; spritePointer += offset; - if ((_vm->getGameType()) != GType_ITE || (_vm->getFeatures() & GF_MAC_RESOURCES)) { - MemoryReadStreamEndian readS2(spritePointer, 8, _spriteContext->isBigEndian); + if (bigHeader) { + MemoryReadStreamEndian readS2(spritePointer, 8, _spriteContext->isBigEndian); spriteInfo->xAlign = readS2.readSint16(); spriteInfo->yAlign = readS2.readSint16(); @@ -139,7 +139,7 @@ void Sprite::loadList(int resourceId, SpriteList &spriteList) { } outputLength = spriteInfo->width * spriteInfo->height; - inputLength = spriteListLength - (spriteDataPointer - spriteListData); + inputLength = spriteListLength - (spriteDataPointer - spriteListData); decodeRLEBuffer(spriteDataPointer, inputLength, outputLength); spriteInfo->decodedBuffer = (byte *) malloc(outputLength); if (spriteInfo->decodedBuffer == NULL) { |