From 213a9de6a10124aad9bae40293866eb64a177300 Mon Sep 17 00:00:00 2001
From: Torbjörn Andersson
Date: Tue, 8 Mar 2005 10:59:31 +0000
Subject: Added constant for the resource number for the first IHNM scene.
 Actually, I believe it's the wrong scene.

Currently we use resource 152, which run the scripts "CampFireSetup" and
"CampFireScene". If I use resource 151 instead it will run the scripts
"ColumnSetup" and "ColumnScene" instead. I'm speculating that this is the
"hate" speech and the rest of the intro ("ColumnScene" is a fairly long
script, as far as I can tell), but unfortunately this causes ScummVM to
crash almost immediately.

I'll need to dissect the scripts to see if I can figure out what's wrong.

svn-id: r17036
---
 saga/game.cpp           | 4 ++--
 saga/ihnm_introproc.cpp | 8 ++++----
 saga/resnames.h         | 1 +
 3 files changed, 7 insertions(+), 6 deletions(-)

(limited to 'saga')

diff --git a/saga/game.cpp b/saga/game.cpp
index f03680647e..e1ed1b2792 100644
--- a/saga/game.cpp
+++ b/saga/game.cpp
@@ -648,7 +648,7 @@ static GameDescription gameDescriptions[] = {
 		GID_IHNM_CD,
 		"I Have No Mouth and I Must Scream (DOS)",
 		&IHNM_DisplayInfo,
-		152,
+		IHNM_DEFAULT_SCENE,
 		&IHNM_Resources,
 		ARRAYSIZE(IHNMCD_GameFiles),
 		IHNMCD_GameFiles,
@@ -665,7 +665,7 @@ static GameDescription gameDescriptions[] = {
 		GID_IHNM_CD_DE,
 		"I Have No Mouth and I Must Scream (DE DOS)",
 		&IHNM_DisplayInfo,
-		152,
+		IHNM_DEFAULT_SCENE,
 		&IHNM_Resources,
 		ARRAYSIZE(IHNMCDDE_GameFiles),
 		IHNMCDDE_GameFiles,
diff --git a/saga/ihnm_introproc.cpp b/saga/ihnm_introproc.cpp
index 2706bc795b..bfe33f9c5a 100644
--- a/saga/ihnm_introproc.cpp
+++ b/saga/ihnm_introproc.cpp
@@ -99,10 +99,10 @@ int Scene::IHNMStartProc() {
 		_vm->_scene->queueScene(&IHNM_IntroList[i]);
 	}
 
-	// FIXME: I believe I've found the correct scene, but since we do not
-	// yet support IHNM script loading it won't actually do anything. Also,
-	// it will cause the end titles music to play, which is wrong. (But
-	// hey, it's a nice piece of music!)
+	// FIXME: I suspect the "hate" speech is actually scripted and that we
+	// start at the wrong scene, but the one I think is correct currently
+	// causes ScummVM to crash. Also, the end titles music to plays over
+	// the scene, which is wrong. (But hey, it's a nice piece of music!)
 
 	first_scene.load_flag = BY_SCENE;
 	first_scene.scene_n = _vm->getStartSceneNumber();
diff --git a/saga/resnames.h b/saga/resnames.h
index caf4199942..0ee6e4e852 100644
--- a/saga/resnames.h
+++ b/saga/resnames.h
@@ -47,6 +47,7 @@ namespace Saga {
 #define ITE_SCENE_INV -1
 
 #define ITE_DEFAULT_SCENE 32
+#define IHNM_DEFAULT_SCENE 152
 
 // FONTS
 #define RID_MEDIUM_FONT 0
-- 
cgit v1.2.3