[Scummvm-cvs-logs] CVS: scummvm/saga game.cpp,1.114,1.115 sprite.cpp,1.74,1.75

[Torbjörn Andersson]

Update of /cvsroot/scummvm/scummvm/saga
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17229

Modified Files:
	game.cpp sprite.cpp 
Log Message:
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. :-)


Index: game.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/game.cpp,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -d -r1.114 -r1.115
--- game.cpp	11 Oct 2005 02:22:53 -0000	1.114
+++ game.cpp	11 Oct 2005 06:08:42 -0000	1.115
@@ -529,7 +529,7 @@
 	{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},

Index: sprite.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/sprite.cpp,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -d -r1.74 -r1.75
--- sprite.cpp	11 Oct 2005 02:22:53 -0000	1.74
+++ sprite.cpp	11 Oct 2005 06:08:42 -0000	1.75
@@ -101,11 +101,11 @@
 
 	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 @@
 		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 @@
 		}
 
 		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) {