TSAGE: Standardised class naming for game scene logic

2 files changed, 184 insertions, 184 deletions

diff --git a/engines/tsage/ringworld_scenes1.cpp b/engines/tsage/ringworld_scenes1.cpp
index 8909313461..b205ab20e4 100644
--- a/engines/tsage/ringworld_scenes1.cpp
+++ b/engines/tsage/ringworld_scenes1.cpp
@@ -35,7 +35,7 @@ namespace tSage {
  *
  *--------------------------------------------------------------------------*/
 
-void Scene10::Scene10_Action1::signal() {
+void Scene10::Action1::signal() {
 	Scene10 *scene = (Scene10 *)_globals->_sceneManager._scene;
 
 	switch (_actionIndex++) {
@@ -110,7 +110,7 @@ void Scene10::Scene10_Action1::signal() {
 	}
 }
 
-void Scene10::Scene10_Action2::signal() {
+void Scene10::Action2::signal() {
 	Scene10 *scene = (Scene10 *)_globals->_sceneManager._scene;
 
 	switch (_actionIndex++) {
@@ -213,7 +213,7 @@ void Scene10::stripCallback(int v) {
  *
  *--------------------------------------------------------------------------*/
 
-void Scene15::Scene15_Action1::signal() {
+void Scene15::Action1::signal() {
 	Scene15 *scene = (Scene15 *)_globals->_sceneManager._scene;
 
 	switch (_actionIndex++) {
@@ -245,7 +245,7 @@ void Scene15::Scene15_Action1::signal() {
 	}			
 }
 
-void Scene15::Scene15_Action1::dispatch() {
+void Scene15::Action1::dispatch() {
 	Scene15 *scene = (Scene15 *)_globals->_sceneManager._scene;
 
 	if (scene->_object1._position.y < 100)
@@ -268,7 +268,7 @@ void Scene15::postInit(SceneObjectList *OwnerList) {
  *
  *--------------------------------------------------------------------------*/
 
-void Scene20::Scene20_Action1::signal() {
+void Scene20::Action1::signal() {
 	Scene20 *scene = (Scene20 *)_globals->_sceneManager._scene;
 
 	switch (_actionIndex++) {
@@ -290,7 +290,7 @@ void Scene20::Scene20_Action1::signal() {
 	}
 }
 
-void Scene20::Scene20_Action2::signal() {
+void Scene20::Action2::signal() {
 	Scene20 *scene = (Scene20 *)_globals->_sceneManager._scene;
 	NpcMover *npcMover;
 
@@ -357,7 +357,7 @@ void Scene20::Scene20_Action2::signal() {
 	}
 }
 
-void Scene20::Scene20_Action3::signal() {
+void Scene20::Action3::signal() {
 	Scene20 *scene = (Scene20 *)_globals->_sceneManager._scene;
 	NpcMover *npcMover;
 
@@ -415,7 +415,7 @@ void Scene20::Scene20_Action3::signal() {
 	}
 }
 
-void Scene20::Scene20_Action4::signal() {
+void Scene20::Action4::signal() {
 	Scene20 *scene = (Scene20 *)_globals->_sceneManager._scene;
 	NpcMover *npcMover;
 
@@ -622,7 +622,7 @@ void Scene20::signal() {
  *
  *--------------------------------------------------------------------------*/
 
-void Scene30::Scene30_beamAction::signal() {
+void Scene30::BeamAction::signal() {
 	Scene30 *scene = (Scene30 *)_globals->_sceneManager._scene;
 
 	switch (_actionIndex++) {
@@ -700,7 +700,7 @@ void Scene30::Scene30_beamAction::signal() {
 	}
 }
 
-void Scene30::Scene30_kzinAction::signal() {
+void Scene30::KzinAction::signal() {
 	Scene30 *scene = (Scene30 *)_globals->_sceneManager._scene;
 
 	switch (_actionIndex++) {
@@ -721,7 +721,7 @@ void Scene30::Scene30_kzinAction::signal() {
 	}
 }
 
-void Scene30::Scene30_ringAction::signal() {
+void Scene30::RingAction::signal() {
 	Scene30 *scene = (Scene30 *)_globals->_sceneManager._scene;
 
 	switch (_actionIndex++) {
@@ -775,7 +775,7 @@ void Scene30::Scene30_ringAction::signal() {
 	}
 }
 
-void Scene30::Scene30_talkAction::signal() {
+void Scene30::TalkAction::signal() {
 	Scene30 *scene = (Scene30 *)_globals->_sceneManager._scene;
 
 	switch (_actionIndex++) {
@@ -806,7 +806,7 @@ void Scene30::Scene30_talkAction::signal() {
 
 /*--------------------------------------------------------------------------*/
 
-void Scene30::Scene30_kzin::doAction(int action) {
+void Scene30::KzinObject::doAction(int action) {
 	Scene30 *scene = (Scene30 *)_globals->_sceneManager._scene;
 
 	switch (action) {
@@ -915,7 +915,7 @@ void Scene30::signal() {
  *
  *--------------------------------------------------------------------------*/
 
-void Scene40::Scene40_Action1::signal() {
+void Scene40::Action1::signal() {
 	Scene40 *scene = (Scene40 *)_globals->_sceneManager._scene;
 
 	switch (_actionIndex++) {
@@ -1041,7 +1041,7 @@ void Scene40::Scene40_Action1::signal() {
 	}
 }
 
-void Scene40::Scene40_Action2::signal() {
+void Scene40::Action2::signal() {
 	Scene40 *scene = (Scene40 *)_globals->_sceneManager._scene;
 
 	switch (_actionIndex++) {
@@ -1124,7 +1124,7 @@ void Scene40::Scene40_Action2::signal() {
 	}
 }
 
-void Scene40::Scene40_Action3::signal() {
+void Scene40::Action3::signal() {
 	Scene40 *scene = (Scene40 *)_globals->_sceneManager._scene;
 
 	switch (_actionIndex++) {
@@ -1160,7 +1160,7 @@ void Scene40::Scene40_Action3::signal() {
 	}
 }
 
-void Scene40::Scene40_Action4::signal() {
+void Scene40::Action4::signal() {
 	switch (_actionIndex++) {
 	case 0: {
 		Common::Point pt(178, 190);
@@ -1175,7 +1175,7 @@ void Scene40::Scene40_Action4::signal() {
 	}
 }
 
-void Scene40::Scene40_Action5::signal() {
+void Scene40::Action5::signal() {
 	Scene40 *scene = (Scene40 *)_globals->_sceneManager._scene;
 
 	switch (_actionIndex++) {
@@ -1188,7 +1188,7 @@ void Scene40::Scene40_Action5::signal() {
 	}
 }
 
-void Scene40::Scene40_Action6::signal() {
+void Scene40::Action6::signal() {
 	Scene40 *scene = (Scene40 *)_globals->_sceneManager._scene;
 
 	switch (_actionIndex++) {
@@ -1224,7 +1224,7 @@ void Scene40::Scene40_Action6::signal() {
 	}
 }
 
-void Scene40::Scene40_Action7::signal() {
+void Scene40::Action7::signal() {
 	Scene40 *scene = (Scene40 *)_globals->_sceneManager._scene;
 
 	switch (_actionIndex++) {
@@ -1251,7 +1251,7 @@ void Scene40::Scene40_Action7::signal() {
 	}
 }
 
-void Scene40::Scene40_Action8::signal() {
+void Scene40::Action8::signal() {
 	Scene40 *scene = (Scene40 *)_globals->_sceneManager._scene;
 
 	switch (_actionIndex++) {
@@ -1304,7 +1304,7 @@ void Scene40::Scene40_Action8::signal() {
 
 /*--------------------------------------------------------------------------*/
 
-void Scene40::Scene40_DyingKzin::doAction(int action) {
+void Scene40::DyingKzin::doAction(int action) {
 	switch (action) {
 	case OBJECT_STUNNER:
 		SceneItem::display2(40, 43);
@@ -1324,7 +1324,7 @@ void Scene40::Scene40_DyingKzin::doAction(int action) {
 	}
 }
 
-void Scene40::Scene40_Assassin::doAction(int action) {
+void Scene40::Assassin::doAction(int action) {
 	Scene40 *scene = (Scene40 *)_globals->_sceneManager._scene;
 
 	switch (action) {
@@ -1368,7 +1368,7 @@ void Scene40::Scene40_Assassin::doAction(int action) {
 
 /*--------------------------------------------------------------------------*/
 
-void Scene40::Scene40_Item2::doAction(int action) {
+void Scene40::Item2::doAction(int action) {
 	switch (action) {
 	case CURSOR_CROSSHAIRS:
 		SceneItem::display2(40, 35);
@@ -1392,7 +1392,7 @@ void Scene40::Scene40_Item2::doAction(int action) {
 	}
 }
 
-void Scene40::Scene40_Item6::doAction(int action) {
+void Scene40::Item6::doAction(int action) {
 	switch (action) {
 	case CURSOR_CROSSHAIRS:
 		SceneItem::display2(40, 25);
@@ -1548,7 +1548,7 @@ void Scene40::dispatch() {
  *
  *--------------------------------------------------------------------------*/
 
-void Scene50::Scene50_Action1::signal() {
+void Scene50::Action1::signal() {
 	Scene50 *scene = (Scene50 *)_globals->_sceneManager._scene;
 
 	switch (_actionIndex++) {
@@ -1576,7 +1576,7 @@ void Scene50::Scene50_Action1::signal() {
 	}
 }
 
-void Scene50::Scene50_Action2::signal() {
+void Scene50::Action2::signal() {
 	Scene50 *scene = (Scene50 *)_globals->_sceneManager._scene;
 
 	switch (_actionIndex++) {
@@ -1597,7 +1597,7 @@ void Scene50::Scene50_Action2::signal() {
 	}
 }
 
-void Scene50::Scene50_Action3::signal() {
+void Scene50::Action3::signal() {
 	switch (_actionIndex++) {
 	case 0: {
 		_globals->_player.disableControl();
@@ -1615,7 +1615,7 @@ void Scene50::Scene50_Action3::signal() {
 
 /*--------------------------------------------------------------------------*/
 
-void Scene50::Scene50_Object1::doAction(int action) {
+void Scene50::Object1::doAction(int action) {
 	Scene50 *scene = (Scene50 *)_globals->_sceneManager._scene;
 
 	switch (action) {
@@ -1642,7 +1642,7 @@ void Scene50::Scene50_Object1::doAction(int action) {
 	}
 }
 
-void Scene50::Scene50_Object2::doAction(int action) {
+void Scene50::Object2::doAction(int action) {
 	Scene50 *scene = (Scene50 *)_globals->_sceneManager._scene;
 
 	switch (action) {
@@ -1666,7 +1666,7 @@ void Scene50::Scene50_Object2::doAction(int action) {
 	}
 }
 
-void Scene50::Scene50_Object3::doAction(int action) {
+void Scene50::Object3::doAction(int action) {
 	Scene50 *scene = (Scene50 *)_globals->_sceneManager._scene;
 
 	switch (action) {
@@ -1694,7 +1694,7 @@ void Scene50::Scene50_Object3::doAction(int action) {
 	}
 }
 
-void Scene50::Scene50_Object4::doAction(int action) {
+void Scene50::Object4::doAction(int action) {
 	Scene50 *scene = (Scene50 *)_globals->_sceneManager._scene;
 
 	switch (action) {
@@ -1825,7 +1825,7 @@ void Scene50::dispatch() {
  *
  *--------------------------------------------------------------------------*/
 
-void Scene60::Scene60_Action1::signal() {
+void Scene60::Action1::signal() {
 	Scene60 *scene = (Scene60 *)_globals->_sceneManager._scene;
 
 	switch (_actionIndex++) {
@@ -1957,7 +1957,7 @@ void Scene60::Scene60_Action1::signal() {
 	}
 }
 
-void Scene60::Scene60_Action2::signal() {
+void Scene60::Action2::signal() {
 	Scene60 *scene = (Scene60 *)_globals->_sceneManager._scene;
 
 	switch (_actionIndex++) {
@@ -1976,7 +1976,7 @@ void Scene60::Scene60_Action2::signal() {
 
 /*--------------------------------------------------------------------------*/
 
-void Scene60::Scene60_Object2::doAction(int action) {
+void Scene60::Object2::doAction(int action) {
 	Scene60 *scene = (Scene60 *)_globals->_sceneManager._scene;
 
 	if (action == CURSOR_LOOK) {
@@ -1994,7 +1994,7 @@ void Scene60::Scene60_Object2::doAction(int action) {
 	}
 }
 
-void Scene60::Scene60_Object3::doAction(int action) {
+void Scene60::Object3::doAction(int action) {
 	Scene60 *scene = (Scene60 *)_globals->_sceneManager._scene;
 
 	if (action == CURSOR_LOOK) {
@@ -2011,7 +2011,7 @@ void Scene60::Scene60_Object3::doAction(int action) {
 	}	
 }
 
-void Scene60::Scene60_Object4::doAction(int action) {
+void Scene60::Object4::doAction(int action) {
 	Scene60 *scene = (Scene60 *)_globals->_sceneManager._scene;
 
 	if (action == CURSOR_LOOK) {
@@ -2074,7 +2074,7 @@ void Scene60::Scene60_Object4::doAction(int action) {
 	}	
 }
 
-void Scene60::Scene60_Object5::doAction(int action) {
+void Scene60::Object5::doAction(int action) {
 	Scene60 *scene = (Scene60 *)_globals->_sceneManager._scene;
 
 	if (action == CURSOR_LOOK) {
@@ -2087,7 +2087,7 @@ void Scene60::Scene60_Object5::doAction(int action) {
 	}	
 }
 
-void Scene60::Scene60_Object6::doAction(int action) {
+void Scene60::Object6::doAction(int action) {
 	Scene60 *scene = (Scene60 *)_globals->_sceneManager._scene;
 
 	if (action == CURSOR_LOOK) {
@@ -2113,7 +2113,7 @@ void Scene60::SceneObject2::synchronise(Serialiser &s) {
 }
 
 
-void Scene60::Scene60_Object7::doAction(int action) {
+void Scene60::Object7::doAction(int action) {
 	Scene60 *scene = (Scene60 *)_globals->_sceneManager._scene;
 
 	if (action == CURSOR_LOOK) {
@@ -2143,7 +2143,7 @@ void Scene60::Scene60_Object7::doAction(int action) {
 	}	
 }
 
-void Scene60::Scene60_Object8::doAction(int action) {
+void Scene60::Object8::doAction(int action) {
 	Scene60 *scene = (Scene60 *)_globals->_sceneManager._scene;
 
 	if (action == CURSOR_LOOK) {
@@ -2173,7 +2173,7 @@ void Scene60::Scene60_Object8::doAction(int action) {
 	}	
 }
 
-void Scene60::Scene60_Object9::doAction(int action) {
+void Scene60::Object9::doAction(int action) {
 	Scene60 *scene = (Scene60 *)_globals->_sceneManager._scene;
 
 	if (action == CURSOR_LOOK) {
@@ -2188,7 +2188,7 @@ void Scene60::Scene60_Object9::doAction(int action) {
 
 /*--------------------------------------------------------------------------*/
 
-void Scene60::Scene60_Item1::doAction(int action) {
+void Scene60::Item1::doAction(int action) {
 	Scene60 *scene = (Scene60 *)_globals->_sceneManager._scene;
 
 	switch (action) {
@@ -2227,7 +2227,7 @@ void Scene60::Scene60_Item1::doAction(int action) {
 	}
 }
 
-void Scene60::Scene60_Item::doAction(int action) {
+void Scene60::Item::doAction(int action) {
 	Scene60 *scene = (Scene60 *)_globals->_sceneManager._scene;
 
 	switch (action) {
@@ -2403,7 +2403,7 @@ void Scene60::process(Event &event) {
  *
  *--------------------------------------------------------------------------*/
 
-void Scene90::Scene90_Action1::signal() {
+void Scene90::Action1::signal() {
 	Scene90 *scene = (Scene90 *)_globals->_sceneManager._scene;
 
 	switch (_actionIndex++) {
@@ -2492,7 +2492,7 @@ void Scene90::Scene90_Action1::signal() {
 
 /*--------------------------------------------------------------------------*/
 
-void Scene90::Scene90_Object1::doAction(int action) {
+void Scene90::Object1::doAction(int action) {
 	Scene90 *scene = (Scene90 *)_globals->_sceneManager._scene;
 
 	switch (action) {
@@ -2510,7 +2510,7 @@ void Scene90::Scene90_Object1::doAction(int action) {
 	}
 }
 
-void Scene90::Scene90_Object2::doAction(int action) {
+void Scene90::Object2::doAction(int action) {
 	Scene90 *scene = (Scene90 *)_globals->_sceneManager._scene;
 
 	switch (action) {
@@ -2661,7 +2661,7 @@ void Scene90::signal() {
  *
  *--------------------------------------------------------------------------*/
 
-void Scene95::Scene95_Action1::signal() {
+void Scene95::Action1::signal() {
 	Scene95 *scene = (Scene95 *)_globals->_sceneManager._scene;
 
 	switch (_actionIndex++) {
@@ -2802,7 +2802,7 @@ void Scene95::postInit(SceneObjectList *OwnerList) {
  *
  *--------------------------------------------------------------------------*/
 
-void Scene1000::Scene1000_Action1::signal() {
+void Scene1000::Action1::signal() {
 	Scene1000 *scene = (Scene1000 *)_globals->_sceneManager._scene;
 
 	switch (_actionIndex++) {
@@ -2836,7 +2836,7 @@ void Scene1000::Scene1000_Action1::signal() {
 
 }
 
-void Scene1000::Scene1000_Action2::signal() {
+void Scene1000::Action2::signal() {
 	switch (_actionIndex++) {
 	case 0:
 		_globals->_player.disableControl();
@@ -2856,7 +2856,7 @@ void Scene1000::Scene1000_Action2::signal() {
 	}
 }
 
-void Scene1000::Scene1000_Action3::signal() {
+void Scene1000::Action3::signal() {
 	Scene1000 *scene = (Scene1000 *)_globals->_sceneManager._scene;
 
 	switch (_actionIndex++) {
@@ -2997,7 +2997,7 @@ void Scene1000::Scene1000_Action3::signal() {
 	}		
 }
 
-void Scene1000::Scene1000_Action3::zoom(bool up) {
+void Scene1000::Action3::zoom(bool up) {
 	Scene1000 *scene = (Scene1000 *)_globals->_sceneManager._scene;
 
 	if (up) {
@@ -3080,7 +3080,7 @@ void Scene1000::postInit(SceneObjectList *OwnerList) {
  *
  *--------------------------------------------------------------------------*/
 
-void Scene6100::Scene6100_Action1::signal() {
+void Scene6100::Action1::signal() {
 	Scene6100 *scene = (Scene6100 *)_globals->_sceneManager._scene;
 
 	switch (_actionIndex++) {
@@ -3097,7 +3097,7 @@ void Scene6100::Scene6100_Action1::signal() {
 	}
 }
 
-void Scene6100::Scene6100_Action2::signal() {
+void Scene6100::Action2::signal() {
 	Scene6100 *scene = (Scene6100 *)_globals->_sceneManager._scene;
 
 	switch (_actionIndex++) {
@@ -3114,7 +3114,7 @@ void Scene6100::Scene6100_Action2::signal() {
 	}
 }
 
-void Scene6100::Scene6100_Action3::signal() {
+void Scene6100::Action3::signal() {
 	Scene6100 *scene = (Scene6100 *)_globals->_sceneManager._scene;
 
 	switch (_actionIndex++) {
@@ -3156,7 +3156,7 @@ void Scene6100::Scene6100_Action3::signal() {
 	}
 }
 
-void Scene6100::Scene6100_Action4::signal() {
+void Scene6100::Action4::signal() {
 	Scene6100 *scene = (Scene6100 *)_globals->_sceneManager._scene;
 
 	switch (_actionIndex++) {
@@ -3173,7 +3173,7 @@ void Scene6100::Scene6100_Action4::signal() {
 	}
 }
 
-void Scene6100::Scene6100_Action5::dispatch() {
+void Scene6100::Action5::dispatch() {
 	Scene6100 *scene = (Scene6100 *)_globals->_sceneManager._scene;
 	FloatSet floatSet = _globals->_floatSet;
 	const double MULTIPLY_FACTOR = 0.01744;
@@ -3285,7 +3285,7 @@ void Scene6100::Scene6100_Action5::dispatch() {
 	}
 }
 
-void Scene6100::Scene6100_Action6::signal() {
+void Scene6100::Action6::signal() {
 	Scene6100 *scene = (Scene6100 *)_globals->_sceneManager._scene;
 
 	switch (_actionIndex++) {
@@ -3323,7 +3323,7 @@ void Scene6100::Scene6100_Action6::signal() {
 	}		
 }
 
-void Scene6100::Scene6100_Action7::signal() {
+void Scene6100::Action7::signal() {
 	switch (_actionIndex++) {
 	case 0:
 		setDelay(30);
@@ -3340,7 +3340,7 @@ void Scene6100::Scene6100_Action7::signal() {
 
 /*--------------------------------------------------------------------------*/
 
-void Scene6100::Scene6100_Item1::doAction(int action) {
+void Scene6100::Item1::doAction(int action) {
 	SceneItem::display2(4000, 0);
 }
 
diff --git a/engines/tsage/ringworld_scenes1.h b/engines/tsage/ringworld_scenes1.h
index 479d5946c5..973cf272b6 100644
--- a/engines/tsage/ringworld_scenes1.h
+++ b/engines/tsage/ringworld_scenes1.h
@@ -37,19 +37,19 @@ namespace tSage {
 
 class Scene10: public Scene {
 	/* Actions */
-	class Scene10_Action1: public Action {
+	class Action1: public Action {
 	public:
 		virtual void signal();
 	};
-	class Scene10_Action2: public Action {
+	class Action2: public Action {
 	public:
 		virtual void signal();
 	};
 public:
 	Speaker _speakerSText;
 	Speaker _speakerQText;
-	Scene10_Action1 _action1;
-	Scene10_Action2 _action2;
+	Action1 _action1;
+	Action2 _action2;
 	SceneObject _object1, _object2, _object3;
 	SceneObject _object4, _object5, _object6;
 
@@ -59,13 +59,13 @@ public:
 
 class Scene15: public Scene {
 	/* Actions */
-	class Scene15_Action1: public Action {
+	class Action1: public Action {
 	public:
 		virtual void signal();
 		virtual void dispatch();
 	};
 public:
-	Scene15_Action1 _action1;
+	Action1 _action1;
 	SceneObject _object1;
 	SoundHandler _soundHandler;
 
@@ -74,19 +74,19 @@ public:
 
 class Scene20: public Scene {
 	/* Actions */
-	class Scene20_Action1: public Action {
+	class Action1: public Action {
 	public:
 		virtual void signal();
 	};
-	class Scene20_Action2: public Action {
+	class Action2: public Action {
 	public:
 		virtual void signal();
 	};
-	class Scene20_Action3: public Action {
+	class Action3: public Action {
 	public:
 		virtual void signal();
 	};
-	class Scene20_Action4: public Action {
+	class Action4: public Action {
 	public:
 		virtual void signal();
 	};
@@ -94,10 +94,10 @@ public:
 	SequenceManager _sequenceManager;
 	SpeakerQText _speakerQText;
 	SpeakerGameText _speakerGameText;
-	Scene20_Action1 _action1;
-	Scene20_Action2 _action2;
-	Scene20_Action3 _action3;
-	Scene20_Action4 _action4;
+	Action1 _action1;
+	Action2 _action2;
+	Action3 _action3;
+	Action4 _action4;
 	SceneObject _sceneObject1, _sceneObject2, _sceneObject3, _sceneObject4, _sceneObject5;
 	SoundHandler _sound;
 public:
@@ -111,7 +111,7 @@ public:
 class Scene30: public Scene {
 	/* Scene objects */
 	// Doorway beam sensor
-	class Scene30_beam: public SceneObject {
+	class BeamObject: public SceneObject {
 	public:
 		virtual void doAction(int action) {
 			if (action == OBJECT_SCANNER)
@@ -127,7 +127,7 @@ class Scene30: public Scene {
 	};
 
 	// Doorway object
-	class Scene30_door: public SceneObject {
+	class DoorObject: public SceneObject {
 	public:
 		virtual void doAction(int action) {
 			if (action == OBJECT_SCANNER)
@@ -142,25 +142,25 @@ class Scene30: public Scene {
 	};
 
 	// Kzin object
-	class Scene30_kzin: public SceneObject {
+	class KzinObject: public SceneObject {
 	public:
 		virtual void doAction(int action);
 	};
 
 	/* Actions */
-	class Scene30_beamAction: public Action {
+	class BeamAction: public Action {
 	public:
 		virtual void signal();
 	};
-	class Scene30_kzinAction: public Action {
+	class KzinAction: public Action {
 	public:
 		virtual void signal();
 	};
-	class Scene30_ringAction: public Action {
+	class RingAction: public Action {
 	public:
 		virtual void signal();
 	};
-	class Scene30_talkAction: public Action {
+	class TalkAction: public Action {
 	public:
 		virtual void signal();
 	};
@@ -168,14 +168,14 @@ class Scene30: public Scene {
 public:
 	SoundHandler _sound;
 	DisplayHotspot _groundHotspot, _wallsHotspot, _courtyardHotspot, _treeHotspot;
-	Scene30_beam _beam;
-	Scene30_door _door;
-	Scene30_kzin _kzin;
-
-	Scene30_beamAction _beamAction;
-	Scene30_kzinAction _kzinAction;
-	Scene30_ringAction _ringAction;
-	Scene30_talkAction _talkAction;
+	BeamObject _beam;
+	DoorObject _door;
+	KzinObject _kzin;
+
+	BeamAction _beamAction;
+	KzinAction _kzinAction;
+	RingAction _ringAction;
+	TalkAction _talkAction;
 	SequenceManager _sequenceManager;
 
 	SpeakerSR _speakerSR;
@@ -192,59 +192,59 @@ public:
 
 class Scene40: public Scene {
 	/* Actions */
-	class Scene40_Action1: public Action {
+	class Action1: public Action {
 	public:
 		virtual void signal();
 	};
-	class Scene40_Action2: public Action {
+	class Action2: public Action {
 	public:
 		virtual void signal();
 	};
-	class Scene40_Action3: public Action {
+	class Action3: public Action {
 	public:
 		virtual void signal();
 	};
-	class Scene40_Action4: public Action {
+	class Action4: public Action {
 	public:
 		virtual void signal();
 	};
-	class Scene40_Action5: public Action {
+	class Action5: public Action {
 	public:
 		virtual void signal();
 	};
-	class Scene40_Action6: public Action {
+	class Action6: public Action {
 	public:
 		virtual void signal();
 	};
-	class Scene40_Action7: public Action {
+	class Action7: public Action {
 	public:
 		virtual void signal();
 	};
-	class Scene40_Action8: public Action {
+	class Action8: public Action {
 	public:
 		virtual void signal();
 	};
 
 	/* Objects */
-	class Scene40_DyingKzin: public SceneObject {
+	class DyingKzin: public SceneObject {
 	public:
 		virtual void doAction(int action);
 	};
-	class Scene40_Assassin: public SceneObject {
+	class Assassin: public SceneObject {
 	public:
 		virtual void doAction(int action);
 	};
 
 	/* Items */
-	class Scene40_Item2: public SceneItem {
+	class Item2: public SceneItem {
 	public:
 		virtual void doAction(int action);
 	};
-	class Scene40_Item6: public SceneItem {
+	class Item6: public SceneItem {
 	public:
 		virtual void doAction(int action);
 	};
-	class Scene40_Item8: public SceneItem {
+	class Item8: public SceneItem {
 	public:
 		virtual void doAction(int action);
 	};
@@ -256,22 +256,22 @@ public:
 	SpeakerSText _speakerSText;
 	SpeakerGameText _speakerGameText;
 	SoundHandler _soundHandler;
-	Scene40_Action1 _action1;
-	Scene40_Action2 _action2;
-	Scene40_Action3 _action3;
-	Scene40_Action4 _action4;
-	Scene40_Action5 _action5;
-	Scene40_Action6 _action6;
-	Scene40_Action7 _action7;
-	Scene40_Action8 _action8;
+	Action1 _action1;
+	Action2 _action2;
+	Action3 _action3;
+	Action4 _action4;
+	Action5 _action5;
+	Action6 _action6;
+	Action7 _action7;
+	Action8 _action8;
 	SceneObject _object1, _object2, _object3;
-	Scene40_DyingKzin _dyingKzin;
-	Scene40_Assassin _assassin;
+	DyingKzin _dyingKzin;
+	Assassin _assassin;
 	SceneObject _doorway, _object7, _object8;
 	DisplayHotspot _item1;
-	Scene40_Item2 _item2;
+	Item2 _item2;
 	DisplayHotspot _item3, _item4, _item5;
-	Scene40_Item6 _item6;
+	Item6 _item6;
 	DisplayHotspot _item7, _item8;
 
 	Scene40();
@@ -282,46 +282,46 @@ public:
 
 class Scene50: public Scene {
 	/* Actions */
-	class Scene50_Action1: public Action {
+	class Action1: public Action {
 	public:
 		virtual void signal();
 	};
-	class Scene50_Action2: public Action {
+	class Action2: public Action {
 	public:
 		virtual void signal();
 	};
-	class Scene50_Action3: public Action {
+	class Action3: public Action {
 	public:
 		virtual void signal();
 	};
 	
 	/* Objects */
-	class Scene50_Object1: public SceneObject {
+	class Object1: public SceneObject {
 	public:
 		virtual void doAction(int action);
 	};
-	class Scene50_Object2: public SceneObject {
+	class Object2: public SceneObject {
 	public:
 		virtual void doAction(int action);
 	};
-	class Scene50_Object3: public SceneObject {
+	class Object3: public SceneObject {
 	public:
 		virtual void doAction(int action);
 	};
-	class Scene50_Object4: public SceneObject {
+	class Object4: public SceneObject {
 	public:
 		virtual void doAction(int action);
 	};
 
 public:
 	SequenceManager _sequenceManager;
-	Scene50_Action1 _action1;
-	Scene50_Action2 _action2;
-	Scene50_Action3 _action3;
-	Scene50_Object1 _object1;
-	Scene50_Object2 _object2;
-	Scene50_Object3 _object3;
-	Scene50_Object4 _object4;
+	Action1 _action1;
+	Action2 _action2;
+	Action3 _action3;
+	Object1 _object1;
+	Object2 _object2;
+	Object3 _object3;
+	Object4 _object4;
 	Rect _doorwayRect;
 	SpeakerSText _speakerSText;
 	SpeakerQText _speakerQText;
@@ -335,35 +335,35 @@ public:
 };
 
 class Scene60: public Scene {	
-	class Scene60_Action1: public Action {
+	class Action1: public Action {
 	public:
 		virtual void signal();
 	};
-	class Scene60_Action2: public Action {
+	class Action2: public Action {
 	public:
 		virtual void signal();
 	};
-	class Scene60_Object2: public SceneObject {
+	class Object2: public SceneObject {
 	public:
 		virtual void doAction(int action);
 	};
-	class Scene60_Object3: public SceneObject {
+	class Object3: public SceneObject {
 	public:
 		virtual void doAction(int action);
 	};
-	class Scene60_Object4: public SceneObject {
+	class Object4: public SceneObject {
 	public:
 		virtual void doAction(int action);
 	};
-	class Scene60_Object5: public SceneObject {
+	class Object5: public SceneObject {
 	public:
 		virtual void doAction(int action);
 	};
-	class Scene60_Object6: public SceneObject {
+	class Object6: public SceneObject {
 	public:
 		virtual void doAction(int action);
 	};
-	class Scene60_Object7: public SceneObject2 {
+	class Object7: public SceneObject2 {
 	public:
 		virtual void doAction(int action);
 	};
@@ -372,23 +372,23 @@ class Scene60: public Scene {
 		int _state;
 		virtual void synchronise(Serialiser &s);
 	};
-	class Scene60_Object8: public SceneObject2 {
+	class Object8: public SceneObject2 {
 	public:
 		virtual void doAction(int action);
 	};
-	class Scene60_Object9: public SceneObject {
+	class Object9: public SceneObject {
 	public:
 		virtual void doAction(int action);
 	};
-	class Scene60_Item1: public SceneItem {
+	class Item1: public SceneItem {
 	public:
 		virtual void doAction(int action);
 	};
-	class Scene60_Item: public SceneItem {
+	class Item: public SceneItem {
 	public:
 		int _messageNum, _sceneMode;
 
-		Scene60_Item(int sceneRegionId, int messageNum, int sceneMode) {
+		Item(int sceneRegionId, int messageNum, int sceneMode) {
 			_sceneRegionId = sceneRegionId;
 			_messageNum = messageNum;
 			_sceneMode = sceneMode;
@@ -401,20 +401,20 @@ public:
 	SequenceManager _sequenceManager;
 	SpeakerQText _speakerQText;
 	SpeakerSText _speakerSText;
-	Scene60_Action1 _action1;
-	Scene60_Action2 _action2;
+	Action1 _action1;
+	Action2 _action2;
 	SceneObject _object1;
-	Scene60_Object2 _object2;
-	Scene60_Object3 _object3;
-	Scene60_Object4 _object4;
-	Scene60_Object5 _object5;
-	Scene60_Object6 _object6;
-	Scene60_Object7 _object7;
-	Scene60_Object8 _object8;
-	Scene60_Object9 _object9;
+	Object2 _object2;
+	Object3 _object3;
+	Object4 _object4;
+	Object5 _object5;
+	Object6 _object6;
+	Object7 _object7;
+	Object8 _object8;
+	Object9 _object9;
 	SceneObject _object10;
 	SceneItem _item1;
-	Scene60_Item _item2, _item3, _item4, _item5, _item6;
+	Item _item2, _item3, _item4, _item5, _item6;
 	SoundHandler _soundHandler1;
 	SoundHandler _soundHandler2;
 	SoundHandler _soundHandler3;
@@ -426,23 +426,23 @@ public:
 };
 
 class Scene90: public Scene {
-	class Scene90_Action1: public Action {
+	class Action1: public Action {
 	public:
 		virtual void signal();
 	};
-	class Scene90_Object1: public SceneObject {
+	class Object1: public SceneObject {
 	public:
 		virtual void doAction(int action);
 	};
-	class Scene90_Object2: public SceneObject {
+	class Object2: public SceneObject {
 	public:
 		virtual void doAction(int action);
 	};
-	class Scene90_Object3: public SceneObject {
+	class Object3: public SceneObject {
 	public:
 		virtual void doAction(int action);
 	};
-	class Scene90_Object4: public SceneObject {
+	class Object4: public SceneObject {
 	public:
 		virtual void doAction(int action);
 	};
@@ -468,13 +468,13 @@ public:
 };
 
 class Scene95: public Scene {
-	class Scene95_Action1: public Action2 {
+	class Action1: public Action2 {
 	public:
 		virtual void signal();
 	};
 
 public:
-	Scene95_Action1 _action1;
+	Action1 _action1;
 	int _field326;
 	SceneObject _object1, _object2, _object3;
 	SoundHandler _soundHandler;
@@ -485,15 +485,15 @@ public:
 
 class Scene1000: public Scene {
 	/* Actions */
-	class Scene1000_Action1: public Action {
+	class Action1: public Action {
 	public:
 		virtual void signal();
 	};
-	class Scene1000_Action2: public Action {
+	class Action2: public Action {
 	public:
 		virtual void signal();
 	};
-	class Scene1000_Action3: public Action {
+	class Action3: public Action {
 	private:
 		void zoom(bool up);
 	public:
@@ -502,77 +502,77 @@ class Scene1000: public Scene {
 
 public:
 	SceneObject _object1, _object2, _object3, _object4;
-	Scene1000_Action1 _action1;
-	Scene1000_Action2 _action2;
-	Scene1000_Action3 _action3;
+	Action1 _action1;
+	Action2 _action2;
+	Action3 _action3;
 
 	virtual void postInit(SceneObjectList *OwnerList = NULL);
 };
 
 class Scene6100: public Scene {
 	/* Actions */
-	class Scene6100_Action1: public Action {
+	class Action1: public Action {
 	public:
 		virtual void signal();
 	};
-	class Scene6100_Action2: public Action {
+	class Action2: public Action {
 	public:
 		virtual void signal();
 	};
-	class Scene6100_Action3: public Action {
+	class Action3: public Action {
 	public:
 		virtual void signal();
 	};
-	class Scene6100_Action4: public Action {
+	class Action4: public Action {
 	public:
 		virtual void signal();
 	};
-	class Scene6100_Action5: public Action {
+	class Action5: public Action {
 	public:
 		virtual void dispatch();
 	};
-	class Scene6100_Action6: public Action {
+	class Action6: public Action {
 	public:
 		virtual void signal();
 	};
-	class Scene6100_Action7: public Action {
+	class Action7: public Action {
 	public:
 		virtual void signal();
 	};
 
 	/* Objects */
-	class Scene6100_Object: public SceneObject {
+	class Object: public SceneObject {
 	public:
 		FloatSet _floats;
 	};
 
 	/* Items */
-	class Scene6100_Item1: public SceneItem {
+	class Item1: public SceneItem {
 	public:
 		virtual void doAction(int action);
 	};
 
 public:
-	Scene6100_Action1 _action1;
-	Scene6100_Action2 _action2;
-	Scene6100_Action3 _action3;
-	Scene6100_Action4 _action4;
-	Scene6100_Action5 _action5;
-	Scene6100_Action6 _action6;
-	Scene6100_Action7 _action7;
+	Action1 _action1;
+	Action2 _action2;
+	Action3 _action3;
+	Action4 _action4;
+	Action5 _action5;
+	Action6 _action6;
+	Action7 _action7;
 	SoundHandler _soundHandler;
 	Speaker _speaker1;
 	SpeakerQR _speakerQR;
 	SpeakerSL _speakerSL;
 	SceneObject _object1, _object2, _object3;
-	Scene6100_Object _object4, _object5, _object6;
-	Scene6100_Object _object7, _object8;
+	Object _object4, _object5, _object6;
+	Object _object7, _object8;
 	SceneText _sceneText;
 	SceneItem _item1;
 
 	int _field_30A, _field_30C, _field_30E, _field_310;
 	int _field_312, _field_314;
-	Scene6100_Object *_objList[4];
+	Object *_objList[4];
 
 	virtual void postInit(SceneObjectList *OwnerList = NULL);
 	void showMessage(const Common::String &msg, int colour, Action *action);