aboutsummaryrefslogtreecommitdiff
path: root/simon
diff options
context:
space:
mode:
authorTravis Howell2004-08-02 11:37:07 +0000
committerTravis Howell2004-08-02 11:37:07 +0000
commite5a59beb826e062b8ec845df8d0e72fd360798ab (patch)
tree3e08ae8f72baefc1010362275760216b9705429c /simon
parent7846a6ed610a59440337d2f2be33c34faf766e34 (diff)
downloadscummvm-rg350-e5a59beb826e062b8ec845df8d0e72fd360798ab.tar.gz
scummvm-rg350-e5a59beb826e062b8ec845df8d0e72fd360798ab.tar.bz2
scummvm-rg350-e5a59beb826e062b8ec845df8d0e72fd360798ab.zip
Cleanup
svn-id: r14435
Diffstat (limited to 'simon')
-rw-r--r--simon/simon.cpp17
-rw-r--r--simon/simon.h3
2 files changed, 2 insertions, 18 deletions
diff --git a/simon/simon.cpp b/simon/simon.cpp
index b2ccba0685..2ea80a082c 100644
--- a/simon/simon.cpp
+++ b/simon/simon.cpp
@@ -2214,7 +2214,7 @@ void SimonEngine::hitarea_stuff_helper_2() {
void SimonEngine::startUp_helper_2() {
if (!_mortal_flag) {
_mortal_flag = true;
- startUp_helper_3();
+ showmessage_print_char(0);
_fcs_unk_1 = 0;
if (_fcs_ptr_array_3[0] != 0) {
_fcs_ptr_1 = _fcs_ptr_array_3[0];
@@ -2224,10 +2224,6 @@ void SimonEngine::startUp_helper_2() {
}
}
-void SimonEngine::startUp_helper_3() {
- showmessage_print_char(0);
-}
-
void SimonEngine::pollMouseXY() {
_mouse_x = _sdl_mouse_x;
_mouse_y = _sdl_mouse_y;
@@ -3365,7 +3361,7 @@ void SimonEngine::fcs_unk_2(uint a) {
return;
_fcs_unk_1 = a;
- startUp_helper_3();
+ showmessage_print_char(0);
_fcs_ptr_1 = _fcs_ptr_array_3[a];
showmessage_helper_3(_fcs_ptr_1->textLength, _fcs_ptr_1->textMaxLength);
@@ -4523,15 +4519,6 @@ void SimonEngine::openGameFile() {
vc_34_force_lock();
- startUp(1);
-}
-
-void SimonEngine::startUp(uint a) {
- if (a == 1)
- startUp_helper();
-}
-
-void SimonEngine::startUp_helper() {
runSubroutine101();
startUp_helper_2();
}
diff --git a/simon/simon.h b/simon/simon.h
index 2acb1877cf..26c456b20e 100644
--- a/simon/simon.h
+++ b/simon/simon.h
@@ -578,10 +578,7 @@ protected:
void processSpecialKeys();
void hitarea_stuff_helper();
- void startUp(uint a);
void startUp_helper_2();
- void startUp_helper_3();
- void startUp_helper();
void showmessage_helper_3(uint a, uint b);
void showmessage_print_char(byte chr);