Merge remote branch 'remotes/Strangerke/master' into tsage

Conflicts:
	engines/tsage/ringworld_logic.cpp
	engines/tsage/ringworld_logic.h

1 files changed, 67 insertions, 8 deletions

diff --git a/engines/tsage/ringworld_logic.h b/engines/tsage/ringworld_logic.h
index 31d8f5e1a3..047c6220d5 100644
--- a/engines/tsage/ringworld_logic.h
+++ b/engines/tsage/ringworld_logic.h
@@ -116,6 +116,21 @@ public:
 	virtual void removeText();
 };	
 
+class SpeakerPOR: public AnimatedSpeaker {
+	class SpeakerAction1: public SpeakerAction {
+	public:
+		virtual void signal();
+	};
+
+public:
+	SceneObject _object3;
+	SpeakerAction1 _action2;
+public:
+	SpeakerPOR();
+	virtual Common::String getClassName() { return "SpeakerPOR"; }
+	virtual void setText(const Common::String &msg);
+};	
+
 class SpeakerOText: public SpeakerGText {
 public:
 	SpeakerOText();
@@ -123,6 +138,13 @@ public:
 	virtual Common::String getClassName() { return "SpeakerOText"; }
 };	
 
+class SpeakerPOText: public ScreenSpeaker {
+public:
+	SpeakerPOText();
+
+	virtual Common::String getClassName() { return "SpeakerPOText"; }
+};
+
 class SpeakerSText: public ScreenSpeaker {
 public:
 	SpeakerSText();
@@ -151,6 +173,20 @@ public:
 	virtual Common::String getClassName() { return "SpeakerCText"; }
 };
 
+class SpeakerEText: public ScreenSpeaker {
+public:
+	SpeakerEText();
+
+	virtual Common::String getClassName() { return "SpeakerEText"; }
+};
+
+class SpeakerGR: public AnimatedSpeaker {
+public:
+	SpeakerGR();
+
+	virtual Common::String getClassName() { return "SpeakerGR"; }
+};	
+
 class SpeakerHText: public ScreenSpeaker {
 public:
 	SpeakerHText();
@@ -172,6 +208,13 @@ public:
 	virtual Common::String getClassName() { return "SpeakerCHFText"; }
 };
 
+class SpeakerSKText: public ScreenSpeaker {
+public:
+	SpeakerSKText();
+
+	virtual Common::String getClassName() { return "SpeakerSKText"; }
+};
+
 class SpeakerCDRText: public ScreenSpeaker {
 public:
 	SpeakerCDRText();
@@ -193,6 +236,30 @@ public:
 	virtual Common::String getClassName() { return "SpeakerFLText"; }
 };
 
+class SpeakerQR: public AnimatedSpeaker {
+public:
+	SpeakerQR();
+
+	virtual Common::String getClassName() { return "SpeakerQR"; }
+	virtual void setText(const Common::String &msg);
+};
+
+class SpeakerQU: public AnimatedSpeaker {
+public:
+	SpeakerQU();
+
+	virtual Common::String getClassName() { return "SpeakerQU"; }
+	virtual void setText(const Common::String &msg);
+};
+
+class SpeakerSKL: public AnimatedSpeaker {
+public:
+	SpeakerSKL();
+
+	virtual Common::String getClassName() { return "SpeakerQL"; }
+	virtual void setText(const Common::String &msg);
+};
+
 class SpeakerQL: public AnimatedSpeaker {
 public:
 	SpeakerQL();
@@ -219,14 +286,6 @@ public:
 	virtual void setText(const Common::String &msg);
 };
 
-class SpeakerQR: public AnimatedSpeaker {
-public:
-	SpeakerQR();
-
-	virtual Common::String getClassName() { return "SpeakerQR"; }
-	virtual void setText(const Common::String &msg);
-};
-
 class SpeakerCR: public AnimatedSpeaker {
 public:
 	SpeakerCR();