[Scummvm-cvs-logs] CVS: scummvm/saga actor.cpp,1.84,1.85 resnames.h,1.18,1.19 script.cpp,1.43,1.44

[Eugene Sandulenko]

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

Modified Files:
	actor.cpp resnames.h script.cpp 
Log Message:
Added proper IHNM scripts lut and run scripts, though not much to see.


Index: actor.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/actor.cpp,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -d -r1.84 -r1.85
--- actor.cpp	9 Jan 2005 15:07:48 -0000	1.84
+++ actor.cpp	9 Jan 2005 21:07:18 -0000	1.85
@@ -385,7 +385,7 @@
 	actor = &_actors[actorIdToIndex(actorId)];
 
 	if (actor->disabled)
-		error("Actor::getActor disabled actorId 0x%X", actorId);
+		warning("Actor::getActor disabled actorId 0x%X", actorId);
 
 	return actor;
 }

Index: resnames.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/resnames.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- resnames.h	8 Jan 2005 20:30:06 -0000	1.18
+++ resnames.h	9 Jan 2005 21:07:19 -0000	1.19
@@ -34,9 +34,11 @@
 #define RID_ITE_SCENE_LUT  1806
 #define RID_ITE_SCRIPT_LUT 216
 
-	// Hmmm.... as far as I see original uses now commented values, but they're wrong
-#define RID_IHNM_SCENE_LUT  1272  // 286
-#define RID_IHNM_SCRIPT_LUT 0     // 18
+#define RID_IHNM_SCENE_LUT  1272
+#define RID_IHNM_SCRIPT_LUT 29
+
+#define RID_IHNMDEMO_SCENE_LUT  286
+#define RID_IHNMDEMO_SCRIPT_LUT 18
 
 // SCENES
 #define ITE_DEFAULT_SCENE 32

Index: script.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/script.cpp,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -d -r1.43 -r1.44
--- script.cpp	8 Jan 2005 20:30:06 -0000	1.43
+++ script.cpp	9 Jan 2005 21:07:19 -0000	1.44
@@ -271,10 +271,6 @@
 	uint32 voicelut_rn;
 	int result;
 
-	if (_vm->_gameType == GType_IHNM) {
-		return SUCCESS;
-	}
-
 	// Validate script number
 	if ((script_num < 0) || (script_num > _scriptLUTMax)) {
 		warning("Script::loadScript(): Invalid script number");