1 files changed, 19 insertions, 40 deletions

diff --git a/engines/tsage/ringworld_scenes1.h b/engines/tsage/ringworld_scenes1.h
index b567aeea2d..be6d8e6337 100644
--- a/engines/tsage/ringworld_scenes1.h
+++ b/engines/tsage/ringworld_scenes1.h
@@ -114,34 +114,13 @@ class Scene30 : public Scene {
 	// Doorway beam sensor
 	class BeamObject : public SceneObject {
 	public:
-		virtual void doAction(int action) {
-			if (action == OBJECT_SCANNER)
-				display(30, 14, SET_WIDTH, 200, SET_EXT_BGCOLOUR, 7, LIST_END);
-			else if (action == CURSOR_LOOK)
-				display(30, 2, SET_WIDTH, 200, SET_EXT_BGCOLOUR, 7, LIST_END);
-			else if (action == CURSOR_USE) {
-				Scene30 *parent = (Scene30 *)_globals->_sceneManager._scene;
-				parent->setAction(&parent->_beamAction);
-			} else
-				SceneObject::doAction(action);
-		}
+		virtual void doAction(int action);
 	};
-
 	// Doorway object
 	class DoorObject : public SceneObject {
 	public:
-		virtual void doAction(int action) {
-			if (action == OBJECT_SCANNER)
-				display(30, 13, SET_WIDTH, 200, SET_EXT_BGCOLOUR, 7, LIST_END);
-			else if (action == CURSOR_LOOK)
-				display(30, 1, SET_WIDTH, 200, SET_EXT_BGCOLOUR, 7, LIST_END);
-			else if (action == CURSOR_USE)
-				display(30, 7, SET_WIDTH, 200, SET_EXT_BGCOLOUR, 7, LIST_END);
-			else
-				SceneObject::doAction(action);
-		}
+		virtual void doAction(int action);
 	};
-
 	// Kzin object
 	class KzinObject : public SceneObject {
 	public:
@@ -344,23 +323,23 @@ class Scene60 : public Scene {
 	public:
 		virtual void signal();
 	};
-	class Object2 : public SceneObject {
+	class PrevObject : public SceneObject {
 	public:
 		virtual void doAction(int action);
 	};
-	class Object3 : public SceneObject {
+	class NextObject : public SceneObject {
 	public:
 		virtual void doAction(int action);
 	};
-	class Object4 : public SceneObject {
+	class ExitObject : public SceneObject {
 	public:
 		virtual void doAction(int action);
 	};
-	class Object5 : public SceneObject {
+	class MessageObject : public SceneObject {
 	public:
 		virtual void doAction(int action);
 	};
-	class Object6 : public SceneObject {
+	class ControlObject : public SceneObject {
 	public:
 		virtual void doAction(int action);
 	};
@@ -368,11 +347,11 @@ class Scene60 : public Scene {
 	public:
 		virtual void doAction(int action);
 	};
-	class Object8 : public SceneObjectExt {
+	class MasterObject : public SceneObjectExt {
 	public:
 		virtual void doAction(int action);
 	};
-	class Object9 : public SceneObject {
+	class FloppyDrive : public SceneObject {
 	public:
 		virtual void doAction(int action);
 	};
@@ -399,16 +378,16 @@ public:
 	SpeakerSText _speakerSText;
 	Action1 _action1;
 	Action2 _action2;
-	SceneObject _object1;
-	Object2 _object2;
-	Object3 _object3;
-	Object4 _object4;
-	Object5 _object5;
-	Object6 _object6;
+	SceneObject _rose;
+	PrevObject _prevButton;
+	NextObject _nextButton;
+	ExitObject _exitButton;
+	MessageObject _message;
+	ControlObject _controlButton;
 	SlaveObject _slaveButton;
-	Object8 _object8;
-	Object9 _object9;
-	SceneObject _object10;
+	MasterObject _masterButton;
+	FloppyDrive _floppyDrive;
+	SceneObject _redLights;
 	Item1 _item1;
 	Item _item2, _item3, _item4, _item5, _item6;
 	SoundHandler _soundHandler1;
@@ -548,7 +527,7 @@ public:
 	virtual void remove();
 	virtual void process(Event &event);
 	virtual void dispatch();
-	void showMessage(const Common::String &msg, int colour, Action *action);
+	void showMessage(const Common::String &msg, int color, Action *action);
 
 };