[Scummvm-cvs-logs] CVS: scummvm/saga game.cpp,1.112,1.113 sprite.cpp,1.72,1.73

[Eugene Sandulenko]

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

Modified Files:
	game.cpp sprite.cpp 
Log Message:
Fixed sprite loading. Now that ugly hack is gone, no wrong reads and every
chapter is selectable without crash. As a side effect all buttons now have
correct backgrounds ;).


Index: game.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/game.cpp,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -d -r1.112 -r1.113
--- game.cpp	10 Oct 2005 23:28:22 -0000	1.112
+++ game.cpp	11 Oct 2005 01:42:21 -0000	1.113
@@ -525,14 +525,14 @@
 // IHNM section
 
 static PanelButton IHNM_MainPanelButtons[] = {
-	{kPanelButtonVerb,		106,12,		114,30,	kVerbWalkTo,'w',0,	0,2,0},
-	{kPanelButtonVerb,		106,44,		114,30,	kVerbLookAt,'l',0,	4,6,0},
-	{kPanelButtonVerb,		106,76,		114,30, kVerbTake,'k',0,	8,10,0},
-	{kPanelButtonVerb,		106,108,	114,30, kVerbUse,'u',0,		12,14,0},
-	{kPanelButtonVerb,		223,12,		114,30, kVerbTalkTo,'t',0,	0,0,0}, // TODO: Find the sprites for the remaining buttons
-	{kPanelButtonVerb,		223,44,		114,30, kVerbSwallow,'s',0,	0,0,0},
-	{kPanelButtonVerb,		223,76,		114,30, kVerbGive,'g',0,	0,0,0},
-	{kPanelButtonVerb,		223,108,	114,30, kVerbPush,'p',0,	0,0,0},
+	{kPanelButtonVerb,		106,12,		114,30,	kVerbWalkTo,'w',0,	0,1,0},
+	{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,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},
 	{kPanelButtonArrow,		606,22,		20,25,	-1,'[',0,			0,0,0}, //TODO: arrow Sprite Numbers
 	{kPanelButtonArrow,		606,108,	20,25,	1,']',0,			0,0,0}
 //TODO:inventory

Index: sprite.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/sprite.cpp,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -d -r1.72 -r1.73
--- sprite.cpp	10 Oct 2005 17:23:28 -0000	1.72
+++ sprite.cpp	11 Oct 2005 01:42:21 -0000	1.73
@@ -103,7 +103,9 @@
 
 	for (i = oldSpriteCount; i < spriteList.spriteCount; i++) {
 		spriteInfo = &spriteList.infoList[i];
-		if (_vm->isMacResources())
+		if (_vm->getGameType() == GType_IHNM)
+			offset = readS.readUint32();
+		else if (_vm->isMacResources())
 			offset = readS.readUint32();
 		else
 			offset = readS.readUint16();
@@ -124,10 +126,6 @@
 			spriteInfo->width = readS2.readUint16();
 			spriteInfo->height = readS2.readUint16();
 
-			if (spriteInfo->width > 200) { // FIXME: HACK
-				warning("Sprite width is too big: (%d x %d)", spriteInfo->width, spriteInfo->height);
-				spriteInfo->width = spriteInfo->height = 0;
-			}
 			spriteDataPointer = spritePointer + readS2.pos();
 		} else {
 			MemoryReadStreamEndian readS2(spritePointer, 4);