aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFilippos Karapetis2013-10-02 01:17:47 -0700
committerFilippos Karapetis2013-10-02 01:17:47 -0700
commit693947ddfc77ff6b0a0089d485f8819db8ccebe0 (patch)
tree71ad314ea43a0e7dbfda7ac0d1d64aa4dbbf92b8
parent408880fa54987acb533ce8ff8dc31b3a72aec6d0 (diff)
parent2fdb99d81977f4f088a39ee4685dc5d6977d33e5 (diff)
downloadscummvm-rg350-693947ddfc77ff6b0a0089d485f8819db8ccebe0.tar.gz
scummvm-rg350-693947ddfc77ff6b0a0089d485f8819db8ccebe0.tar.bz2
scummvm-rg350-693947ddfc77ff6b0a0089d485f8819db8ccebe0.zip
Merge pull request #403 from rrebello/saga_cppcheck_fix
SAGA: Silent Cppcheck warning in Sprite::loadList().
-rw-r--r--engines/saga/sprite.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/engines/saga/sprite.cpp b/engines/saga/sprite.cpp
index 2895c6800c..fe281afe3e 100644
--- a/engines/saga/sprite.cpp
+++ b/engines/saga/sprite.cpp
@@ -102,7 +102,6 @@ void Sprite::loadList(int resourceId, SpriteList &spriteList) {
bool bigHeader = _vm->getGameId() == GID_IHNM || _vm->isMacResources();
for (i = oldSpriteCount; i < spriteList.size(); i++) {
- spriteInfo = &spriteList[i];
if (bigHeader)
offset = readS.readUint32();
else
@@ -117,6 +116,7 @@ void Sprite::loadList(int resourceId, SpriteList &spriteList) {
spritePointer = spriteListData.getBuffer();
spritePointer += offset;
+ spriteInfo = &spriteList[i];
if (bigHeader) {
Common::MemoryReadStreamEndian readS2(spritePointer, 8, _spriteContext->isBigEndian());