From b2ce645c1e3e501c36b460ff2049b5cb989ddfa1 Mon Sep 17 00:00:00 2001
From: strangerke <arnaud.boutonne@gmail.com>
Date: Mon, 21 Mar 2011 08:33:55 +0100
Subject: [PATCH] TSAGE: Cleanup after git merge epic failure

---
 engines/tsage/ringworld_logic.cpp | 49 -------------------------------
 1 file changed, 49 deletions(-)

diff --git a/engines/tsage/ringworld_logic.cpp b/engines/tsage/ringworld_logic.cpp
index 67297527bc4..42a01024a78 100644
--- a/engines/tsage/ringworld_logic.cpp
+++ b/engines/tsage/ringworld_logic.cpp
@@ -417,15 +417,6 @@ SpeakerEText::SpeakerEText() {
 
 /*--------------------------------------------------------------------------*/
 
-SpeakerEText::SpeakerEText() {
-	_speakerName = "ETEXT";
-	_textPos = Common::Point(20, 20);
-	_colour1 = 22;
-	_hideObjects = false;
-}
-
-/*--------------------------------------------------------------------------*/
-
 SpeakerHText::SpeakerHText() {
 	_speakerName = "HTEXT";
 	_textPos = Common::Point(160, 40);
@@ -475,16 +466,6 @@ void SpeakerSKL::setText(const Common::String &msg) {
 }
 /*--------------------------------------------------------------------------*/
 
-SpeakerSKText::SpeakerSKText(): ScreenSpeaker() {
-	_speakerName = "SKTEXT";
-	_textWidth = 240;
-	_textMode = ALIGN_CENTRE;
-	_colour1 = 9;
-	_hideObjects = false;
-};
-
-/*--------------------------------------------------------------------------*/
-
 SpeakerPText::SpeakerPText() {
 	_speakerName = "PTEXT";
 	_textWidth = 240;
@@ -505,36 +486,6 @@ SpeakerCHFText::SpeakerCHFText() {
 
 /*--------------------------------------------------------------------------*/
 
-SpeakerSKL::SpeakerSKL(): AnimatedSpeaker() {
-	_speakerName = "SKL";
-	_newSceneNumber = 7011;
-	_textPos = Common::Point(10, 30);
-	_colour1 = 10;
-}
-
-void SpeakerSKL::setText(const Common::String &msg) {
-	_object1.postInit(&_objectList);
-	_object1.setVisage(7013);
-	_object1.setStrip2(2);
-	_object1._frame = 1;
-	_object1.setPriority2(255);
-	_object1.changeZoom(100);
-	_object1.setPosition(Common::Point(203, 120));
-	_object1.animate(ANIM_MODE_7, 0, NULL);
-	
-	_object2.postInit(&_objectList);
-	_object2.setVisage(7013);
-	_object2.setStrip2(1);
-	_object2.setPriority2(255);
-	_object2.changeZoom(100);
-	_object2._frame = 1;
-	_object2.setPosition(Common::Point(197, 80));
-	_object2.setAction(&_speakerAction, NULL);
-
-	Speaker::setText(msg);
-}
-/*--------------------------------------------------------------------------*/
-
 SpeakerQL::SpeakerQL(): AnimatedSpeaker() {
 	_speakerName = "QL";
 	_newSceneNumber = 2610;