[Scummvm-cvs-logs] CVS: scummvm/saga game.cpp,1.57,1.58 ihnm_introproc.cpp,1.39,1.40 resnames.h,1.24,1.25

Torbjörn Andersson eriktorbjorn at users.sourceforge.net
Tue Mar 8 02:59:54 CET 2005


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

Modified Files:
	game.cpp ihnm_introproc.cpp resnames.h 
Log Message:
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.


Index: game.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/game.cpp,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -d -r1.57 -r1.58
--- game.cpp	21 Jan 2005 21:55:52 -0000	1.57
+++ game.cpp	8 Mar 2005 10:59:31 -0000	1.58
@@ -648,7 +648,7 @@
 		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 @@
 		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,

Index: ihnm_introproc.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/ihnm_introproc.cpp,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- ihnm_introproc.cpp	15 Jan 2005 20:12:47 -0000	1.39
+++ ihnm_introproc.cpp	8 Mar 2005 10:59:31 -0000	1.40
@@ -99,10 +99,10 @@
 		_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();

Index: resnames.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/resnames.h,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- resnames.h	18 Feb 2005 00:00:00 -0000	1.24
+++ resnames.h	8 Mar 2005 10:59:31 -0000	1.25
@@ -47,6 +47,7 @@
 #define ITE_SCENE_INV -1
 
 #define ITE_DEFAULT_SCENE 32
+#define IHNM_DEFAULT_SCENE 152
 
 // FONTS
 #define RID_MEDIUM_FONT 0





More information about the Scummvm-git-logs mailing list