Code cleanup:

- Removed sagaresnames.h
- Moved all special scenes to scene.h, and named them consistently (e.g. RID_ITE_OVERMAP_SCENE -> ITE_SCENE_OVERMAP)
- Moved all resources which were used by the ITE intro into ite_introproc.cpp
- Removed several defines which were only used once (e.g. the SFX names)
- Reordered the GameResourceDescription resources so that ITE and IHNM specific resources are placed in the end
- Updated the comment about the IHNM Mac music
- Changed the callocs in loadPalAnim to mallocs, like in the rest of the code
- Removed the MEM error

svn-id: r32282

1 files changed, 17 insertions, 18 deletions

diff --git a/engines/saga/saga.cpp b/engines/saga/saga.cpp
index 8200526ecf..40eb32b276 100644
--- a/engines/saga/saga.cpp
+++ b/engines/saga/saga.cpp
@@ -53,7 +53,6 @@
 #include "saga/music.h"
 #include "saga/palanim.h"
 #include "saga/objectmap.h"
-#include "saga/sagaresnames.h"
 
 namespace Saga {
 
@@ -251,7 +250,7 @@ int SagaEngine::go() {
 		_scene->changeScene(ConfMan.getInt("start_scene"), 0, kTransitionNoFade);
 	} else if (ConfMan.hasKey("boot_param")) {
 		if (getGameType() == GType_ITE)
-			_interface->addToInventory(_actor->objIndexToId(ITE_OBJ_MAGIC_HAT));
+			_interface->addToInventory(_actor->objIndexToId(0));	// Magic hat
 		_scene->changeScene(ConfMan.getInt("boot_param"), 0, kTransitionNoFade);
 	} else if (ConfMan.hasKey("save_slot")) {
 		// First scene sets up palette
@@ -421,25 +420,25 @@ const char *SagaEngine::getTextString(int textStringId) {
 void SagaEngine::getExcuseInfo(int verb, const char *&textString, int &soundResourceId) {
 	textString = NULL;
 
-	if (verb == _script->getVerbType(kVerbPickUp)) {
-		textString = getTextString(kTextICantPickup);
-		soundResourceId = RID_BOAR_VOICE_007;
-	} else
-		if (verb == _script->getVerbType(kVerbLookAt)) {
-		textString = getTextString(kTextNothingSpecial);
-		soundResourceId = RID_BOAR_VOICE_006;
-		}
-		if (verb == _script->getVerbType(kVerbOpen)) {
+	if (verb == _script->getVerbType(kVerbOpen)) {
 		textString = getTextString(kTextNoPlaceToOpen);
-		soundResourceId = RID_BOAR_VOICE_000;
-		}
-		if (verb == _script->getVerbType(kVerbClose)) {
+		soundResourceId = 239;		// Boar voice 0
+	}
+	if (verb == _script->getVerbType(kVerbClose)) {
 		textString = getTextString(kTextNoOpening);
-		soundResourceId = RID_BOAR_VOICE_002;
-		}
-		if (verb == _script->getVerbType(kVerbUse)) {
+		soundResourceId = 241;		// Boar voice 2
+	}
+	if (verb == _script->getVerbType(kVerbUse)) {
 		textString = getTextString(kTextDontKnow);
-		soundResourceId = RID_BOAR_VOICE_005;
+		soundResourceId = 244;		// Boar voice 5
+	}
+	if (verb == _script->getVerbType(kVerbLookAt)) {
+		textString = getTextString(kTextNothingSpecial);
+		soundResourceId = 245;		// Boar voice 6
+	}
+	if (verb == _script->getVerbType(kVerbPickUp)) {
+		textString = getTextString(kTextICantPickup);
+		soundResourceId = 246;		// Boar voice 7
 	}
 }