Merged o_unk_103() into o1_cls().

svn-id: r21746

2 files changed, 6 insertions, 11 deletions

diff --git a/engines/simon/items.cpp b/engines/simon/items.cpp
index 5c7b1b05c3..6e6eb29c0b 100644
--- a/engines/simon/items.cpp
+++ b/engines/simon/items.cpp
@@ -909,7 +909,12 @@ void SimonEngine::o1_window() {
 
 void SimonEngine::o1_cls() {
 	// 103
-	o_unk_103();
+	mouseOff();
+	removeIconArray(_curWindow);
+	showMessageFormat("\x0C");
+	_oracleMaxScrollY = 0;
+	_noOracleScroll = 0;
+	mouseOn();
 }
 
 void SimonEngine::o1_closeWindow() {
@@ -1977,15 +1982,6 @@ void SimonEngine::o_setTextColor(uint color) {
 	window->text_color = color;
 }
 
-void SimonEngine::o_unk_103() {
-	mouseOff();
-	removeIconArray(_curWindow);
-	showMessageFormat("\x0C");
-	_oracleMaxScrollY = 0;
-	_noOracleScroll = 0;
-	mouseOn();
-}
-
 void SimonEngine::o_kill_sprite_simon1(uint a) {
 	uint16 b = to16Wrapper(a);
 	_lockWord |= 0x8000;
diff --git a/engines/simon/simon.h b/engines/simon/simon.h
index 1ad33039fc..e9b5cc476c 100644
--- a/engines/simon/simon.h
+++ b/engines/simon/simon.h
@@ -558,7 +558,6 @@ protected:
 	void o_kill_sprite_simon2(uint a, uint b);
 
 	void changeWindow(uint a);
-	void o_unk_103();
 	void closeWindow(uint a);
 	void clear_hitarea_bit_0x40(uint hitarea);
 	void set_hitarea_bit_0x40(uint hitarea);