[Scummvm-cvs-logs] CVS: scummvm/saga game.cpp,1.18,1.19 ihnm_introproc.cpp,1.17,1.18 ite_introproc.cpp,1.25,1.26 scene.cpp,1.32,1.33 scene.h,1.9,1.10 ihnm_introproc.h,1.3,NONE ite_introproc.h,1.6,NONE ite_introproc_mod.h,1.2,NONE

Eugene Sandulenko sev at users.sourceforge.net
Wed Aug 11 16:43:01 CEST 2004


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

Modified Files:
	game.cpp ihnm_introproc.cpp ite_introproc.cpp scene.cpp 
	scene.h 
Removed Files:
	ihnm_introproc.h ite_introproc.h ite_introproc_mod.h 
Log Message:
Move ITE_* and IHNM_* to Scene class.


Index: game.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/game.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- game.cpp	6 Aug 2004 01:39:17 -0000	1.18
+++ game.cpp	11 Aug 2004 23:42:02 -0000	1.19
@@ -31,8 +31,8 @@
 
 #include "saga/rscfile_mod.h"
 #include "saga/cvar_mod.h"
-#include "saga/ite_introproc_mod.h"
 #include "saga/interface.h"
+#include "saga/scene.h"
 
 #include "saga/game_mod.h"
 #include "saga/game.h"
@@ -364,7 +364,7 @@
 			return R_FAILURE;
 		}
 
-		if (ITE_IntroRegisterLang() != R_SUCCESS) {
+		if (_vm->_scene->ITEIntroRegisterLang() != R_SUCCESS) {
 			warning("Error registering intro sequence language cvars");
 			return R_FAILURE;
 		}

Index: ihnm_introproc.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/ihnm_introproc.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- ihnm_introproc.cpp	11 Aug 2004 22:27:38 -0000	1.17
+++ ihnm_introproc.cpp	11 Aug 2004 23:42:02 -0000	1.18
@@ -33,15 +33,9 @@
 #include "saga/rscfile_mod.h"
 
 #include "saga/scene.h"
-#include "saga/ihnm_introproc.h"
 
 namespace Saga {
 
-int IHNM_IntroMovieProc1(int param, R_SCENE_INFO *scene_info);
-int IHNM_IntroMovieProc2(int param, R_SCENE_INFO *scene_info);
-int IHNM_IntroMovieProc3(int param, R_SCENE_INFO *scene_info);
-int IHNM_HateProc(int param, R_SCENE_INFO *scene_info);
-
 R_SCENE_RESLIST IHNM_IntroMovie1RL[] = {
 	{30, SAGA_BG_IMAGE, 0, 0} ,
 	{31, SAGA_ANIM_1, 0, 0}
@@ -87,13 +81,13 @@
 };
 
 R_SCENE_QUEUE IHNM_IntroList[] = {
-	{0, &IHNM_IntroMovie1Desc, BY_DESC, IHNM_IntroMovieProc1, 0, SCENE_NOFADE},
-	{0, &IHNM_IntroMovie2Desc, BY_DESC, IHNM_IntroMovieProc2, 0, SCENE_NOFADE},
-	{0, &IHNM_IntroMovie3Desc, BY_DESC, IHNM_IntroMovieProc3, 0, SCENE_NOFADE},
-	{0, &IHNM_IntroMovie4Desc, BY_DESC, IHNM_HateProc, 0, SCENE_NOFADE}
+	{0, &IHNM_IntroMovie1Desc, BY_DESC, Scene::SC_IHNMIntroMovieProc1, 0, SCENE_NOFADE},
+	{0, &IHNM_IntroMovie2Desc, BY_DESC, Scene::SC_IHNMIntroMovieProc2, 0, SCENE_NOFADE},
+	{0, &IHNM_IntroMovie3Desc, BY_DESC, Scene::SC_IHNMIntroMovieProc3, 0, SCENE_NOFADE},
+	{0, &IHNM_IntroMovie4Desc, BY_DESC, Scene::SC_IHNMHateProc, 0, SCENE_NOFADE}
 };
 
-int IHNM_StartProc() {
+int Scene::IHNMStartProc() {
 	size_t n_introscenes;
 	size_t i;
 
@@ -106,7 +100,11 @@
 	return R_SUCCESS;
 }
 
-int IHNM_IntroMovieProc1(int param, R_SCENE_INFO *scene_info) {
+int Scene::SC_IHNMIntroMovieProc1(int param, R_SCENE_INFO *scene_info, void *refCon) {
+	return ((Scene *)refCon)->IHNMIntroMovieProc1(param, scene_info);
+}
+
+int Scene::IHNMIntroMovieProc1(int param, R_SCENE_INFO *scene_info) {
 	R_EVENT event;
 
 	switch (param) {
@@ -130,7 +128,11 @@
 	return 0;
 }
 
-int IHNM_IntroMovieProc2(int param, R_SCENE_INFO *scene_info) {
+int Scene::SC_IHNMIntroMovieProc2(int param, R_SCENE_INFO *scene_info, void *refCon) {
+	return ((Scene *)refCon)->IHNMIntroMovieProc2(param, scene_info);
+}
+
+int Scene::IHNMIntroMovieProc2(int param, R_SCENE_INFO *scene_info) {
 	R_EVENT event;
 	R_EVENT *q_event;
 	PALENTRY *pal;
@@ -191,7 +193,11 @@
 	return 0;
 }
 
-int IHNM_IntroMovieProc3(int param, R_SCENE_INFO *scene_info) {
+int Scene::SC_IHNMIntroMovieProc3(int param, R_SCENE_INFO *scene_info, void *refCon) {
+	return ((Scene *)refCon)->IHNMIntroMovieProc3(param, scene_info);
+}
+
+int Scene::IHNMIntroMovieProc3(int param, R_SCENE_INFO *scene_info) {
 	R_EVENT event;
 	R_EVENT *q_event;
 	PALENTRY *pal;
@@ -250,7 +256,11 @@
 	return 0;
 }
 
-int IHNM_HateProc(int param, R_SCENE_INFO *scene_info) {
+int Scene::SC_IHNMHateProc(int param, R_SCENE_INFO *scene_info, void *refCon) {
+	return ((Scene *)refCon)->IHNMHateProc(param, scene_info);
+}
+
+int Scene::IHNMHateProc(int param, R_SCENE_INFO *scene_info) {
 	R_EVENT event;
 	R_EVENT *q_event;
 

Index: ite_introproc.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/ite_introproc.cpp,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- ite_introproc.cpp	11 Aug 2004 22:27:38 -0000	1.25
+++ ite_introproc.cpp	11 Aug 2004 23:42:02 -0000	1.26
@@ -40,20 +40,9 @@
 #include "saga/music.h"
 
 #include "saga/scene.h"
-#include "saga/ite_introproc.h"
 
 namespace Saga {
 
-int ITE_IntroAnimProc(int param, R_SCENE_INFO *scene_info);
-int ITE_IntroCave1Proc(int param, R_SCENE_INFO *scene_info);
-int ITE_IntroCave2Proc(int param, R_SCENE_INFO *scene_info);
-int ITE_IntroCave3Proc(int param, R_SCENE_INFO *scene_info);
-int ITE_IntroCave4Proc(int param, R_SCENE_INFO *scene_info);
-int ITE_IntroValleyProc(int param, R_SCENE_INFO *scene_info);
-int ITE_IntroTreeHouseProc(int param, R_SCENE_INFO *scene_info);
-int ITE_IntroFairePathProc(int param, R_SCENE_INFO *scene_info);
-int ITE_IntroFaireTentProc(int param, R_SCENE_INFO *scene_info);
-
 static R_INTRO_DIALOGUE IntroDiag[] = {
 	{
 		CAVE_VOICE_0, "intro1a",
@@ -123,18 +112,18 @@
 };
 
 R_SCENE_QUEUE ITE_IntroList[] = {
-	{ITE_INTRO_ANIM_SCENE, NULL, BY_RESOURCE, ITE_IntroAnimProc, 0, SCENE_NOFADE},
-	{ITE_CAVE_SCENE_1, NULL, BY_RESOURCE, ITE_IntroCave1Proc, 0, SCENE_FADE_NO_INTERFACE},
-	{ITE_CAVE_SCENE_2, NULL, BY_RESOURCE, ITE_IntroCave2Proc, 0, SCENE_NOFADE},
-	{ITE_CAVE_SCENE_3, NULL, BY_RESOURCE, ITE_IntroCave3Proc, 0, SCENE_NOFADE},
-	{ITE_CAVE_SCENE_4, NULL, BY_RESOURCE, ITE_IntroCave4Proc, 0, SCENE_NOFADE},
-	{ITE_VALLEY_SCENE, NULL, BY_RESOURCE, ITE_IntroValleyProc, 0, SCENE_FADE_NO_INTERFACE},
-	{ITE_TREEHOUSE_SCENE, NULL, BY_RESOURCE, ITE_IntroTreeHouseProc, 0, SCENE_NOFADE},
-	{ITE_FAIREPATH_SCENE, NULL, BY_RESOURCE, ITE_IntroFairePathProc, 0, SCENE_NOFADE},
-	{ITE_FAIRETENT_SCENE, NULL, BY_RESOURCE, ITE_IntroFaireTentProc, 0, SCENE_NOFADE}
+	{ITE_INTRO_ANIM_SCENE, NULL, BY_RESOURCE, Scene::SC_ITEIntroAnimProc, 0, SCENE_NOFADE},
+	{ITE_CAVE_SCENE_1, NULL, BY_RESOURCE, Scene::SC_ITEIntroCave1Proc, 0, SCENE_FADE_NO_INTERFACE},
+	{ITE_CAVE_SCENE_2, NULL, BY_RESOURCE, Scene::SC_ITEIntroCave2Proc, 0, SCENE_NOFADE},
+	{ITE_CAVE_SCENE_3, NULL, BY_RESOURCE, Scene::SC_ITEIntroCave3Proc, 0, SCENE_NOFADE},
+	{ITE_CAVE_SCENE_4, NULL, BY_RESOURCE, Scene::SC_ITEIntroCave4Proc, 0, SCENE_NOFADE},
+	{ITE_VALLEY_SCENE, NULL, BY_RESOURCE, Scene::SC_ITEIntroValleyProc, 0, SCENE_FADE_NO_INTERFACE},
+	{ITE_TREEHOUSE_SCENE, NULL, BY_RESOURCE, Scene::SC_ITEIntroTreeHouseProc, 0, SCENE_NOFADE},
+	{ITE_FAIREPATH_SCENE, NULL, BY_RESOURCE, Scene::SC_ITEIntroFairePathProc, 0, SCENE_NOFADE},
+	{ITE_FAIRETENT_SCENE, NULL, BY_RESOURCE, Scene::SC_ITEIntroFaireTentProc, 0, SCENE_NOFADE}
 };
 
-int ITE_StartProc() {
+int Scene::ITEStartProc() {
 	size_t n_introscenes;
 	size_t i;
 
@@ -160,7 +149,7 @@
 	return R_SUCCESS;
 }
 
-int ITE_IntroRegisterLang() {
+int Scene::ITEIntroRegisterLang() {
 	size_t i;
 
 	for (i = 0; i < ARRAYSIZE(IntroDiag); i++) {
@@ -175,8 +164,12 @@
 	return R_SUCCESS;
 }
 
+int Scene::SC_ITEIntroAnimProc(int param, R_SCENE_INFO *scene_info, void *refCon) {
+	return ((Scene *)refCon)->ITEIntroAnimProc(param, scene_info);
+}
+
 // Handles the introductory Dreamer's Guild / NWC logo animation scene.
-int ITE_IntroAnimProc(int param, R_SCENE_INFO *scene_info) {
+int Scene::ITEIntroAnimProc(int param, R_SCENE_INFO *scene_info) {
 	R_EVENT event;
 
 	switch (param) {
@@ -233,8 +226,12 @@
 	return 0;
 }
 
+int Scene::SC_ITEIntroCave1Proc(int param, R_SCENE_INFO *scene_info, void *refCon) {
+	return ((Scene *)refCon)->ITEIntroCave1Proc(param, scene_info);
+}
+
 // Handles first introductory cave painting scene
-int ITE_IntroCave1Proc(int param, R_SCENE_INFO *scene_info) {
+int Scene::ITEIntroCave1Proc(int param, R_SCENE_INFO *scene_info) {
 	R_EVENT event;
 	R_EVENT *q_event;
 	int event_time = 0;
@@ -321,8 +318,12 @@
 	return 0;
 }
 
+int Scene::SC_ITEIntroCave2Proc(int param, R_SCENE_INFO *scene_info, void *refCon) {
+	return ((Scene *)refCon)->ITEIntroCave2Proc(param, scene_info);
+}
+
 // Handles second introductory cave painting scene
-int ITE_IntroCave2Proc(int param, R_SCENE_INFO *scene_info) {
+int Scene::ITEIntroCave2Proc(int param, R_SCENE_INFO *scene_info) {
 	R_EVENT event;
 	R_EVENT *q_event;
 	int event_time = 0;
@@ -417,8 +418,12 @@
 	return 0;
 }
 
+int Scene::SC_ITEIntroCave3Proc(int param, R_SCENE_INFO *scene_info, void *refCon) {
+	return ((Scene *)refCon)->ITEIntroCave3Proc(param, scene_info);
+}
+
 // Handles third introductory cave painting scene
-int ITE_IntroCave3Proc(int param, R_SCENE_INFO *scene_info) {
+int Scene::ITEIntroCave3Proc(int param, R_SCENE_INFO *scene_info) {
 	R_EVENT event;
 	R_EVENT *q_event;
 	int event_time = 0;
@@ -514,8 +519,12 @@
 	return 0;
 }
 
+int Scene::SC_ITEIntroCave4Proc(int param, R_SCENE_INFO *scene_info, void *refCon) {
+	return ((Scene *)refCon)->ITEIntroCave4Proc(param, scene_info);
+}
+
 // Handles fourth introductory cave painting scene
-int ITE_IntroCave4Proc(int param, R_SCENE_INFO *scene_info) {
+int Scene::ITEIntroCave4Proc(int param, R_SCENE_INFO *scene_info) {
 	R_EVENT event;
 	R_EVENT *q_event;
 	int event_time = 0;
@@ -611,8 +620,12 @@
 	return 0;
 }
 
+int Scene::SC_ITEIntroValleyProc(int param, R_SCENE_INFO *scene_info, void *refCon) {
+	return ((Scene *)refCon)->ITEIntroValleyProc(param, scene_info);
+}
+
 // Handles intro title scene (valley overlook)
-int ITE_IntroValleyProc(int param, R_SCENE_INFO *scene_info) {
+int Scene::ITEIntroValleyProc(int param, R_SCENE_INFO *scene_info) {
 	R_TEXTLIST_ENTRY text_entry;
 	R_TEXTLIST_ENTRY *entry_p;
 	R_EVENT event;
@@ -752,8 +765,12 @@
 	return 0;
 }
 
+int Scene::SC_ITEIntroTreeHouseProc(int param, R_SCENE_INFO *scene_info, void *refCon) {
+	return ((Scene *)refCon)->ITEIntroTreeHouseProc(param, scene_info);
+}
+
 // Handles second intro credit screen (treehouse view)
-int ITE_IntroTreeHouseProc(int param, R_SCENE_INFO *scene_info) {
+int Scene::ITEIntroTreeHouseProc(int param, R_SCENE_INFO *scene_info) {
 	R_TEXTLIST_ENTRY text_entry;
 	R_TEXTLIST_ENTRY *entry_p;
 	R_EVENT event;
@@ -858,8 +875,12 @@
 	return 0;
 }
 
+int Scene::SC_ITEIntroFairePathProc(int param, R_SCENE_INFO *scene_info, void *refCon) {
+	return ((Scene *)refCon)->ITEIntroFairePathProc(param, scene_info);
+}
+
 // Handles third intro credit screen (path to puzzle tent)
-int ITE_IntroFairePathProc(int param, R_SCENE_INFO *scene_info) {
+int Scene::ITEIntroFairePathProc(int param, R_SCENE_INFO *scene_info) {
 	R_TEXTLIST_ENTRY text_entry;
 	R_TEXTLIST_ENTRY *entry_p;
 	R_EVENT event;
@@ -967,8 +988,12 @@
 	return 0;
 }
 
+int Scene::SC_ITEIntroFaireTentProc(int param, R_SCENE_INFO *scene_info, void *refCon) {
+	return ((Scene *)refCon)->ITEIntroFaireTentProc(param, scene_info);
+}
+
 // Handles fourth intro credit screen (treehouse view)
-int ITE_IntroFaireTentProc(int param, R_SCENE_INFO *scene_info) {
+int Scene::ITEIntroFaireTentProc(int param, R_SCENE_INFO *scene_info) {
 	R_EVENT event;
 	R_EVENT *q_event;
 	R_EVENT *q_event_start;

Index: scene.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/scene.cpp,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- scene.cpp	11 Aug 2004 22:47:45 -0000	1.32
+++ scene.cpp	11 Aug 2004 23:42:02 -0000	1.33
@@ -44,17 +44,12 @@
 #include "saga/music.h"
 
 #include "saga/scene.h"
-#include "saga/ite_introproc.h"
-#include "saga/ihnm_introproc.h"
 
 namespace Saga {
 
 static void CF_scenechange(int argc, char *argv[], void *refCon);
 static void CF_sceneinfo(int argc, char *argv[], void *refCon);
 
-int defaultScene(int param, R_SCENE_INFO *scene_info);
-
-
 int Scene::reg() {
 	CVAR_Register_I(&_sceneNumber, "scene", NULL, R_CVAR_READONLY, 0, 0);
 	CVAR_RegisterFunc(CF_scenechange, "scene_change", "<Scene number>", R_CVAR_NONE, 1, 1, this);
@@ -186,10 +181,10 @@
 
 	switch (GAME_GetGameType()) {
 	case R_GAMETYPE_ITE:
-		ITE_StartProc();
+		ITEStartProc();
 		break;
 	case R_GAMETYPE_IHNM:
-		IHNM_StartProc();
+		IHNMStartProc();
 		break;
 	default:
 		warning("Scene::start(): Error: Can't start game... gametype not supported");
@@ -321,7 +316,7 @@
 	}
 
 	endScene();
-	loadScene(scene_num, BY_SCENE, defaultScene, NULL, false);
+	loadScene(scene_num, BY_SCENE, SC_defaultScene, NULL, false);
 
 	return R_SUCCESS;
 }
@@ -540,14 +535,14 @@
 	}
 
 	if (scene_proc == NULL) {
-		_sceneProc = defaultScene;
+		_sceneProc = SC_defaultScene;
 	} else {
 		_sceneProc = scene_proc;
 	}
 
 	getInfo(&scene_info);
 
-	_sceneProc(SCENE_BEGIN, &scene_info);
+	_sceneProc(SCENE_BEGIN, &scene_info, this);
 
 	return R_SUCCESS;
 }
@@ -822,7 +817,7 @@
 
 	getInfo(&scene_info);
 
-	_sceneProc(SCENE_END, &scene_info);
+	_sceneProc(SCENE_END, &scene_info, this);
 
 	if (_desc.scriptNum > 0) {
 		_vm->_script->freeScript();
@@ -912,7 +907,11 @@
 	((Scene *)refCon)->sceneInfoCmd(argc, argv);
 }
 
-int defaultScene(int param, R_SCENE_INFO *scene_info) {
+int Scene::SC_defaultScene(int param, R_SCENE_INFO *scene_info, void *refCon) {
+	return ((Scene *)refCon)->defaultScene(param, scene_info);
+}
+
+int Scene::defaultScene(int param, R_SCENE_INFO *scene_info) {
 	R_EVENT event;
 
 	switch (param) {
@@ -949,6 +948,10 @@
 		_vm->_anim->setFlag(0, ANIM_LOOP);
 		_vm->_anim->play(0, 0);
 
+		if (_desc.startScriptNum > 0) {
+			debug(0, "Starting start script #%d", _desc.startScriptNum);
+		}
+
 		debug(0, "Scene started");
 		break;
 	case SCENE_END:

Index: scene.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/scene.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- scene.h	11 Aug 2004 22:27:39 -0000	1.9
+++ scene.h	11 Aug 2004 23:42:02 -0000	1.10
@@ -57,7 +57,7 @@
 	R_TEXTLIST *text_list;
 };
 
-typedef int (R_SCENE_PROC) (int, R_SCENE_INFO *);
+typedef int (R_SCENE_PROC) (int, R_SCENE_INFO *, void *);
 
 #define PALETTE_FADE_DURATION 1000
 
@@ -149,6 +149,62 @@
 	int fadeType;
 };
 
+///// IHNM-specific stuff
+#define R_IHNM_PALFADE_TIME    1000
+#define R_IHNM_INTRO_FRAMETIME 80
+#define R_IHNM_DGLOGO_TIME     8000
+#define R_IHNM_TITLE_TIME      16000
+
+///// ITE-specific stuff
+#define R_INTRO_STRMAX 256
+
+#define ITE_INTRO_FRAMETIME 90
+
+#define INTRO_CAPTION_Y 170
+#define VOICE_PAD 50
+#define VOICE_LETTERLEN 90
+
+#define PALETTE_FADE_DURATION 1000
+#define DISSOLVE_DURATION 3000
+#define LOGO_DISSOLVE_DURATION 1000
+
+#define CREDIT_DURATION1 4000
+
+enum R_INTRO_SCENE_DIALOGUE_INFO {
+	INTRO_CAVE1_START = 0,
+	INTRO_CAVE1_END = 4,
+
+	INTRO_CAVE2_START = 4,
+	INTRO_CAVE2_END = 7,
+
+	INTRO_CAVE3_START = 7,
+	INTRO_CAVE3_END = 10,
+
+	INTRO_CAVE4_START = 10,
+	INTRO_CAVE4_END = 14
+};
+
+struct R_INTRO_DIALOGUE {
+	uint32 i_voice_rn;
+	const char *i_cvar_name;
+	char i_str[R_INTRO_STRMAX];
+};
+
+struct INTRO_CAPTION {
+	int res_n;
+	char *caption;
+};
+
+struct INTRO_CREDIT {
+	int text_x;
+	int text_y;
+	int delta_time;
+	int duration;
+	const char *string;
+	int font_id;
+};
+
+
 class Scene {
  public:
 	Scene(SagaEngine *vm);
@@ -209,6 +265,49 @@
 	R_TEXTLIST *_textList;
 	SCENE_IMAGE _bg;
 	SCENE_IMAGE _bgMask;
+
+	static int SC_defaultScene(int param, R_SCENE_INFO *scene_info, void *refCon);
+	int defaultScene(int param, R_SCENE_INFO *scene_info);
+
+ private:
+	int IHNMStartProc();
+	int ITEStartProc();
+
+ public:
+	static int SC_IHNMIntroMovieProc1(int param, R_SCENE_INFO *scene_info, void *refCon);
+	static int SC_IHNMIntroMovieProc2(int param, R_SCENE_INFO *scene_info, void *refCon);
+	static int SC_IHNMIntroMovieProc3(int param, R_SCENE_INFO *scene_info, void *refCon);
+	static int SC_IHNMHateProc(int param, R_SCENE_INFO *scene_info, void *refCon);
+
+ private:
+	int IHNMIntroMovieProc1(int param, R_SCENE_INFO *scene_info);
+	int IHNMIntroMovieProc2(int param, R_SCENE_INFO *scene_info);
+	int IHNMIntroMovieProc3(int param, R_SCENE_INFO *scene_info);
+	int IHNMHateProc(int param, R_SCENE_INFO *scene_info);
+
+ public:
+	int ITEIntroRegisterLang(void);
+	static int SC_ITEIntroAnimProc(int param, R_SCENE_INFO *scene_info, void *refCon);
+	static int SC_ITEIntroCave1Proc(int param, R_SCENE_INFO *scene_info, void *refCon);
+	static int SC_ITEIntroCave2Proc(int param, R_SCENE_INFO *scene_info, void *refCon);
+	static int SC_ITEIntroCave3Proc(int param, R_SCENE_INFO *scene_info, void *refCon);
+	static int SC_ITEIntroCave4Proc(int param, R_SCENE_INFO *scene_info, void *refCon);
+	static int SC_ITEIntroValleyProc(int param, R_SCENE_INFO *scene_info, void *refCon);
+	static int SC_ITEIntroTreeHouseProc(int param, R_SCENE_INFO *scene_info, void *refCon);
+	static int SC_ITEIntroFairePathProc(int param, R_SCENE_INFO *scene_info, void *refCon);
+	static int SC_ITEIntroFaireTentProc(int param, R_SCENE_INFO *scene_info, void *refCon);
+
+ private:
+	int ITEIntroAnimProc(int param, R_SCENE_INFO *scene_info);
+	int ITEIntroCave1Proc(int param, R_SCENE_INFO *scene_info);
+	int ITEIntroCave2Proc(int param, R_SCENE_INFO *scene_info);
+	int ITEIntroCave3Proc(int param, R_SCENE_INFO *scene_info);
+	int ITEIntroCave4Proc(int param, R_SCENE_INFO *scene_info);
+	int ITEIntroValleyProc(int param, R_SCENE_INFO *scene_info);
+	int ITEIntroTreeHouseProc(int param, R_SCENE_INFO *scene_info);
+	int ITEIntroFairePathProc(int param, R_SCENE_INFO *scene_info);
+	int ITEIntroFaireTentProc(int param, R_SCENE_INFO *scene_info);
+
 };
 
 } // End of namespace Saga

--- ihnm_introproc.h DELETED ---

--- ite_introproc.h DELETED ---

--- ite_introproc_mod.h DELETED ---





More information about the Scummvm-git-logs mailing list