SAGA: Remove the now unneeded individual cave scene handlers

scummvm · Jul 20, 2014 · 7bab457 · 7bab457
1 parent bb353d1
commit 7bab457
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 28 deletions.
diff --git a/engines/saga/introproc_ite.cpp b/engines/saga/introproc_ite.cpp
@@ -436,40 +436,24 @@ int Scene::ITEIntroCaveCommonProc(int param, int caveScene) {
 	return 0;
 }
 
-int Scene::SC_ITEIntroCave1Proc(int param, void *refCon) {
-	return ((Scene *)refCon)->ITEIntroCave1Proc(param);
-}
-
 // Handles first introductory cave painting scene
-int Scene::ITEIntroCave1Proc(int param) {
-	return ITEIntroCaveCommonProc(param, 1);
-}
-
-int Scene::SC_ITEIntroCave2Proc(int param, void *refCon) {
-	return ((Scene *)refCon)->ITEIntroCave2Proc(param);
+int Scene::SC_ITEIntroCave1Proc(int param, void *refCon) {
+	return ((Scene *)refCon)->ITEIntroCaveCommonProc(param, 1);
 }
 
 // Handles second introductory cave painting scene
-int Scene::ITEIntroCave2Proc(int param) {
-	return ITEIntroCaveCommonProc(param, 2);
-}
-
-int Scene::SC_ITEIntroCave3Proc(int param, void *refCon) {
-	return ((Scene *)refCon)->ITEIntroCave3Proc(param);
+int Scene::SC_ITEIntroCave2Proc(int param, void *refCon) {
+	return ((Scene *)refCon)->ITEIntroCaveCommonProc(param, 2);
 }
 
 // Handles third introductory cave painting scene
-int Scene::ITEIntroCave3Proc(int param) {
-	return ITEIntroCaveCommonProc(param, 3);
-}
-
-int Scene::SC_ITEIntroCave4Proc(int param, void *refCon) {
-	return ((Scene *)refCon)->ITEIntroCave4Proc(param);
+int Scene::SC_ITEIntroCave3Proc(int param, void *refCon) {
+	return ((Scene *)refCon)->ITEIntroCaveCommonProc(param, 3);
 }
 
 // Handles fourth introductory cave painting scene
-int Scene::ITEIntroCave4Proc(int param) {
-	return ITEIntroCaveCommonProc(param, 4);
+int Scene::SC_ITEIntroCave4Proc(int param, void *refCon) {
+	return ((Scene *)refCon)->ITEIntroCaveCommonProc(param, 4);
 }
 
 int Scene::SC_ITEIntroValleyProc(int param, void *refCon) {

diff --git a/engines/saga/scene.h b/engines/saga/scene.h
@@ -408,10 +408,6 @@ class Scene {
 	EventColumns *ITEQueueDialogue(EventColumns *eventColumns, int n_dialogues, const IntroDialogue dialogue[]);
 	EventColumns *ITEQueueCredits(int delta_time, int duration, int n_credits, const IntroCredit credits[]);
 	int ITEIntroAnimProc(int param);
-	int ITEIntroCave1Proc(int param);
-	int ITEIntroCave2Proc(int param);
-	int ITEIntroCave3Proc(int param);
-	int ITEIntroCave4Proc(int param);
 	int ITEIntroCaveCommonProc(int param, int caveScene);
 	int ITEIntroValleyProc(int param);
 	int ITEIntroTreeHouseProc(int param);