[Scummvm-cvs-logs] CVS: scummvm/saga actor.cpp,1.57,1.58 game.cpp,1.42,1.43

Eugene Sandulenko sev at users.sourceforge.net
Tue Dec 28 15:19:04 CET 2004


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

Modified Files:
	actor.cpp game.cpp 
Log Message:
Fix regression with IHNM. 
Add IHNM demo MD5s. demo does not work at all yet


Index: actor.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/actor.cpp,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -d -r1.57 -r1.58
--- actor.cpp	28 Dec 2004 21:27:17 -0000	1.57
+++ actor.cpp	28 Dec 2004 23:18:10 -0000	1.58
@@ -82,6 +82,11 @@
 	ActorData *actor;
 	debug(9, "Actor::Actor()");
 
+	if (_vm->_gameType == GType_IHNM) {
+		warning("Actors aren't implemented for IHNM yet");
+		return;
+	}
+
 	_centerActor = _protagonist = NULL;
 	_lastTickMsec = 0;
 

Index: game.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/game.cpp,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- game.cpp	28 Dec 2004 21:27:17 -0000	1.42
+++ game.cpp	28 Dec 2004 23:18:11 -0000	1.43
@@ -281,6 +281,11 @@
 	{ GID_IHNM_CD, "1f501ce4b72392bdd1d9ec38f6eec6da", "voices5.res" },
 	{ GID_IHNM_CD, "f580ed7568c7d6ef34e934ba20adf834", "voices6.res" },
 	{ GID_IHNM_CD, "54b1f2013a075338ceb0e258d97808bd", "voicess.res" },
+
+	{ GID_IHNM_DEMO, "46bbdc65d164ba7e89836a0935eec8e6", "scream.res" },
+	{ GID_IHNM_DEMO, "9626bda8978094ff9b29198bc1ed5f9a", "scripts.res" },
+	{ GID_IHNM_DEMO, "1c610d543f32ec8b525e3f652536f269", "sfx.res" },
+	{ GID_IHNM_DEMO, "3bbc16a8f741dbb511da506c660a0b54", "voicesd.res" },
 };
 
 static GAMEDESC GameDescs[] = {
@@ -514,8 +519,8 @@
 		&IHNM_Resources,
 		ARRAYSIZE(IHNMDEMO_GameFiles),
 		IHNMDEMO_GameFiles,
-		0,
-		NULL,
+		ARRAYSIZE(IHNMCD_GameFonts),
+		IHNMCD_GameFonts,
 		&IHNM_GameSound,
 		GF_DEFAULT_TO_1X_SCALER
 	},





More information about the Scummvm-git-logs mailing list