Merged o_printStr() into o1_screenTextMsg().

svn-id: r21758

3 files changed, 25 insertions, 30 deletions

diff --git a/engines/simon/items.cpp b/engines/simon/items.cpp
index 7a14bd52ac..d6bf274c06 100644
--- a/engines/simon/items.cpp
+++ b/engines/simon/items.cpp
@@ -1329,7 +1329,31 @@ void SimonEngine::o1_screenTextBox() {
 	
 void SimonEngine::o1_screenTextMsg() {
 	// 162: print string
-	o_printStr();
+	uint vgaSpriteId = getVarOrByte();
+	uint color = getVarOrByte();
+	uint stringId = getNextStringID();
+	const byte *string_ptr = NULL;
+	uint speech_id = 0;
+	TextLocation *tl;
+
+	if (stringId != 0xFFFF)
+		string_ptr = getStringPtrByID(stringId);
+
+	if (getFeatures() & GF_TALKIE)
+		speech_id = (uint16)getNextWord();
+
+	if (getGameType() == GType_FF)
+		vgaSpriteId = 1;
+
+	tl = getTextLocation(vgaSpriteId);
+	if (_speech && speech_id != 0)
+		playSpeech(speech_id, vgaSpriteId);
+	if ((getGameType() == GType_SIMON2) && (getFeatures() & GF_TALKIE) && speech_id == 0)
+		o_kill_sprite_simon2(2, vgaSpriteId + 2);
+
+	if (string_ptr != NULL && (speech_id == 0 || _subtitles))
+		printScreenText(vgaSpriteId, color, (const char *)string_ptr, tl->x, tl->y, tl->width);
+
 }
 
 void SimonEngine::o1_playEffect() {
diff --git a/engines/simon/simon.cpp b/engines/simon/simon.cpp
index 6518ac9dd4..4a2d5849bc 100644
--- a/engines/simon/simon.cpp
+++ b/engines/simon/simon.cpp
@@ -2144,34 +2144,6 @@ TextLocation *SimonEngine::getTextLocation(uint a) {
 	return NULL;
 }
 
-void SimonEngine::o_printStr() {
-	uint vgaSpriteId = getVarOrByte();
-	uint color = getVarOrByte();
-	uint stringId = getNextStringID();
-	const byte *string_ptr = NULL;
-	uint speech_id = 0;
-	TextLocation *tl;
-
-	if (stringId != 0xFFFF)
-		string_ptr = getStringPtrByID(stringId);
-
-	if (getFeatures() & GF_TALKIE)
-		speech_id = (uint16)getNextWord();
-
-	if (getGameType() == GType_FF)
-		vgaSpriteId = 1;
-
-	tl = getTextLocation(vgaSpriteId);
-	if (_speech && speech_id != 0)
-		playSpeech(speech_id, vgaSpriteId);
-	if ((getGameType() == GType_SIMON2) && (getFeatures() & GF_TALKIE) && speech_id == 0)
-		o_kill_sprite_simon2(2, vgaSpriteId + 2);
-
-	if (string_ptr != NULL && (speech_id == 0 || _subtitles))
-		printScreenText(vgaSpriteId, color, (const char *)string_ptr, tl->x, tl->y, tl->width);
-
-}
-
 void SimonEngine::loadZone(uint vga_res) {
 	VgaPointersEntry *vpe;
 
diff --git a/engines/simon/simon.h b/engines/simon/simon.h
index 8996dd1876..c62e7785b5 100644
--- a/engines/simon/simon.h
+++ b/engines/simon/simon.h
@@ -585,7 +585,6 @@ protected:
 	void o_fadeToBlack();
 
 	TextLocation *getTextLocation(uint a);
-	void o_printStr();
 	void o_setup_cond_c();
 	void setup_cond_c_helper();