aboutsummaryrefslogtreecommitdiff
path: root/engines/saga
diff options
context:
space:
mode:
authorFilippos Karapetis2014-07-20 17:17:00 +0300
committerFilippos Karapetis2014-07-20 17:17:00 +0300
commit7bab457a2376bd62410efc98961658b99446d462 (patch)
tree73de99b905feb08dff9205f6ad8195239c412b52 /engines/saga
parentbb353d14fdcd8373a50cb8b0de5fc386ec588883 (diff)
downloadscummvm-rg350-7bab457a2376bd62410efc98961658b99446d462.tar.gz
scummvm-rg350-7bab457a2376bd62410efc98961658b99446d462.tar.bz2
scummvm-rg350-7bab457a2376bd62410efc98961658b99446d462.zip
SAGA: Remove the now unneeded individual cave scene handlers
Diffstat (limited to 'engines/saga')
-rw-r--r--engines/saga/introproc_ite.cpp32
-rw-r--r--engines/saga/scene.h4
2 files changed, 8 insertions, 28 deletions
diff --git a/engines/saga/introproc_ite.cpp b/engines/saga/introproc_ite.cpp
index 4094e8cab6..3b6fc25873 100644
--- 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
index fc23a46f8a..bf58b2f299 100644
--- 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);