[Scummvm-cvs-logs] scummvm master -> 693947ddfc77ff6b0a0089d485f8819db8ccebe0

bluegr bluegr at gmail.com
Wed Oct 2 10:18:08 CEST 2013


This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
2fdb99d819 SAGA: Silent Cppcheck warning in Sprite::loadList().
693947ddfc Merge pull request #403 from rrebello/saga_cppcheck_fix


Commit: 2fdb99d81977f4f088a39ee4685dc5d6977d33e5
    https://github.com/scummvm/scummvm/commit/2fdb99d81977f4f088a39ee4685dc5d6977d33e5
Author: Rodrigo Rebello (rprebello at gmail.com)
Date: 2013-10-02T00:33:54-07:00

Commit Message:
SAGA: Silent Cppcheck warning in Sprite::loadList().

Changed paths:
    engines/saga/sprite.cpp



diff --git a/engines/saga/sprite.cpp b/engines/saga/sprite.cpp
index 2895c68..fe281af 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());


Commit: 693947ddfc77ff6b0a0089d485f8819db8ccebe0
    https://github.com/scummvm/scummvm/commit/693947ddfc77ff6b0a0089d485f8819db8ccebe0
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2013-10-02T01:17:47-07:00

Commit Message:
Merge pull request #403 from rrebello/saga_cppcheck_fix

SAGA: Silent Cppcheck warning in Sprite::loadList().

Changed paths:
    engines/saga/sprite.cpp









More information about the Scummvm-git-logs mailing list