From 470dac5f8b2c0d57879fbc636aacc2087a916777 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Thu, 19 Jul 2007 01:28:41 +0000
Subject: IHNM: Correct mapping of the arrow and save reminder sprites for the
 IHNM demo

svn-id: r28143
---
 engines/saga/sprite.cpp | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'engines/saga/sprite.cpp')

diff --git a/engines/saga/sprite.cpp b/engines/saga/sprite.cpp
index 607e7d0a0b..bbe73a48a0 100644
--- a/engines/saga/sprite.cpp
+++ b/engines/saga/sprite.cpp
@@ -57,8 +57,13 @@ Sprite::Sprite(SagaEngine *vm) : _vm(vm) {
 		loadList(_vm->getResourceDescription()->mainSpritesResourceId, _mainSprites);
 		_arrowSprites = _saveReminderSprites = _inventorySprites = _mainSprites;
 	} else {
-		loadList(RID_IHNM_ARROW_SPRITES, _arrowSprites);
-		loadList(RID_IHNM_SAVEREMINDER_SPRITES, _saveReminderSprites);
+		if (_vm->getGameId() == GID_IHNM_DEMO) {
+			loadList(RID_IHNMDEMO_ARROW_SPRITES, _arrowSprites);
+			loadList(RID_IHNMDEMO_SAVEREMINDER_SPRITES, _saveReminderSprites);
+		} else {
+			loadList(RID_IHNM_ARROW_SPRITES, _arrowSprites);
+			loadList(RID_IHNM_SAVEREMINDER_SPRITES, _saveReminderSprites);
+		}
 	}
 }
 
-- 
cgit v1.2.3


From cd20f09a9d8085d1082313fd1d58c87deeb30333 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Tue, 31 Jul 2007 18:08:40 +0000
Subject: Cleanup: removed dead code, fixed some comments and did some layout
 changes

svn-id: r28362
---
 engines/saga/sprite.cpp | 1 +
 1 file changed, 1 insertion(+)

(limited to 'engines/saga/sprite.cpp')

diff --git a/engines/saga/sprite.cpp b/engines/saga/sprite.cpp
index bbe73a48a0..1a70a44bbd 100644
--- a/engines/saga/sprite.cpp
+++ b/engines/saga/sprite.cpp
@@ -24,6 +24,7 @@
  */
 
 // Sprite management module
+
 #include "saga/saga.h"
 
 #include "saga/gfx.h"
-- 
cgit v1.2.3


From 4abcd58c76434c3bc995fc92c9d6223d4f577a32 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Wed, 1 Aug 2007 02:19:05 +0000
Subject: Updated the ITE demo versions

svn-id: r28379
---
 engines/saga/sprite.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'engines/saga/sprite.cpp')

diff --git a/engines/saga/sprite.cpp b/engines/saga/sprite.cpp
index 1a70a44bbd..ac911e5a9c 100644
--- a/engines/saga/sprite.cpp
+++ b/engines/saga/sprite.cpp
@@ -119,7 +119,9 @@ void Sprite::loadList(int resourceId, SpriteList &spriteList) {
 			offset = readS.readUint16();
 
 		if (offset >= spriteListLength) {
-			error("Sprite::loadList offset exceed");
+			// ITE Mac demos throw this warning
+			warning("Sprite::loadList offset exceeded");
+			return;			
 		}
 
 		spritePointer = spriteListData;
-- 
cgit v1.2.3