[Scummvm-cvs-logs] CVS: scummvm/simon simon.cpp,1.448,1.449 simon.h,1.124,1.125

[Travis Howell]

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

Modified Files:
	simon.cpp simon.h 
Log Message:

Cleanup


Index: simon.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.cpp,v
retrieving revision 1.448
retrieving revision 1.449
diff -u -d -r1.448 -r1.449
--- simon.cpp	31 Jul 2004 13:56:04 -0000	1.448
+++ simon.cpp	2 Aug 2004 11:37:06 -0000	1.449
@@ -2214,7 +2214,7 @@
 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_3() {
-	showmessage_print_char(0);
-}
-
 void SimonEngine::pollMouseXY() {
 	_mouse_x = _sdl_mouse_x;
 	_mouse_y = _sdl_mouse_y;
@@ -3365,7 +3361,7 @@
 		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 @@
 
 	vc_34_force_lock();
 	
-	startUp(1);
-}
-
-void SimonEngine::startUp(uint a) {
-	if (a == 1)
-		startUp_helper();
-}
-
-void SimonEngine::startUp_helper() {
 	runSubroutine101();
 	startUp_helper_2();
 }

Index: simon.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.h,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -d -r1.124 -r1.125
--- simon.h	14 Mar 2004 17:50:40 -0000	1.124
+++ simon.h	2 Aug 2004 11:37:07 -0000	1.125
@@ -578,10 +578,7 @@
 	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);