TSAGE: Rename SceneHotspot_3 to NamedHotspot

2 files changed, 140 insertions, 140 deletions

diff --git a/engines/tsage/ringworld_scenes10.cpp b/engines/tsage/ringworld_scenes10.cpp
index 79df3185c0..493b8dc85a 100644
--- a/engines/tsage/ringworld_scenes10.cpp
+++ b/engines/tsage/ringworld_scenes10.cpp
@@ -38,7 +38,7 @@ Scene2::Scene2() {
 
 /*--------------------------------------------------------------------------*/
 
-void SceneHotspot_3::doAction(int action) {
+void NamedHotspot::doAction(int action) {
 	switch (action) {
 	case CURSOR_WALK:
 		// Nothing
@@ -61,7 +61,7 @@ void SceneHotspot_3::doAction(int action) {
 	}
 }
 
-void SceneHotspot_3::quickInit(const int ys, const int xe, const int ye, const int xs, const int resnum, const int lookLineNum, const int useLineNum) {
+void NamedHotspot::quickInit(const int ys, const int xe, const int ye, const int xs, const int resnum, const int lookLineNum, const int useLineNum) {
 	setBounds(ys, xe, ye, xs);
 	_resnum = resnum;
 	_lookLineNum = lookLineNum;
@@ -102,7 +102,7 @@ void Scene9100::SceneHotspot1::doAction(int action) {
 		}
 		scene->setAction(&scene->_sequenceManager, scene, scene->_sceneMode, &_globals->_player, &scene->_object5, &scene->_object6, 0);
 	} else {
-		SceneHotspot_3::doAction(action);
+		NamedHotspot::doAction(action);
 	}
 }
 
@@ -353,7 +353,7 @@ void Scene9200::SceneHotspot1::doAction(int action) {
 		scene->_sceneState = 9214;
 		setAction(&scene->_sequenceManager, scene, 9214, &_globals->_player, &scene->_object2, 0);
 	} else {
-		SceneHotspot_3::doAction(action);
+		NamedHotspot::doAction(action);
 	}
 }
 
@@ -749,7 +749,7 @@ void Scene9400::SceneHotspot7::doAction(int action) {
 		scene->_sceneState = 1;
 		scene->setAction(&scene->_sequenceManager, scene, 9408, &_globals->_player, 0);
 	} else {
-		SceneHotspot_3::doAction(action);
+		NamedHotspot::doAction(action);
 	}
 }
 
@@ -761,7 +761,7 @@ void Scene9400::SceneHotspot8::doAction(int action) {
 		scene->_sceneState = 2;
 		scene->signal();
 	} else {
-		SceneHotspot_3::doAction(action);
+		NamedHotspot::doAction(action);
 	}
 }
 
@@ -877,7 +877,7 @@ void Scene9450::Hotspot1::doAction(int action) {
 		_globals->_player.disableControl();
 		setAction(&scene->_sequenceManager1, scene, 9459, &scene->_object2, &scene->_object1, &scene->_object3, &_globals->_player, 0);
 	} else {
-		SceneHotspot_3::doAction(action);
+		NamedHotspot::doAction(action);
 	}
 }
 
@@ -1047,7 +1047,7 @@ void Scene9500::Hotspot1::doAction(int action) {
 		scene->_hotspot2.quickInit(87, 294, 104, 314, 9400, 17, -1);
 		scene->setAction(&scene->_sequenceManager, scene, 9510, &_globals->_player, &scene->_object2, 0);
 	} else {
-		SceneHotspot_3::doAction(action);
+		NamedHotspot::doAction(action);
 	}
 }
 
@@ -1060,7 +1060,7 @@ void Scene9500::Hotspot2::doAction(int action) {
 		_globals->_sceneItems.remove(this);
 		scene->setAction(&scene->_sequenceManager, scene, 9511, &_globals->_player, &scene->_object2, 0);
 	} else {
-		SceneHotspot_3::doAction(action);
+		NamedHotspot::doAction(action);
 	}
 }
 
@@ -1073,7 +1073,7 @@ void Scene9500::Hotspot3::doAction(int action) {
 		_globals->_sceneItems.remove(this);
 		scene->setAction(&scene->_sequenceManager, scene, 9505, &_globals->_player, &scene->_candle, 0);
 	} else {
-		SceneHotspot_3::doAction(action);
+		NamedHotspot::doAction(action);
 	}
 }
 
@@ -1098,7 +1098,7 @@ void Scene9500::Hotspot4::doAction(int action) {
 		_globals->_inventory._straw._sceneNumber = 9500;
 		scene->setAction(&scene->_sequenceManager, scene, 9512, &_globals->_player, &scene->_object3, 0);
 	} else {
-		SceneHotspot_3::doAction(action);
+		NamedHotspot::doAction(action);
 	}
 }
 
@@ -1403,7 +1403,7 @@ void Scene9850::Hotspot12::doAction(int action) {
 			setAction(&scene->_sequenceManager, scene, 9861, &_globals->_player, &scene->_objTunic2, 0);
 		}
 	} else if ((action != CURSOR_LOOK) || (_globals->_inventory._tunic2._sceneNumber != 1)) {
-		SceneHotspot_3::doAction(action);
+		NamedHotspot::doAction(action);
 	} else {
 		SceneItem::display(9850, 30, SET_Y, 20, SET_WIDTH, 200, SET_EXT_BGCOLOUR, 7, LIST_END);
 	}
@@ -1425,7 +1425,7 @@ void Scene9850::Hotspot14::doAction(int action) {
 			setAction(&scene->_sequenceManager, scene, 9860, &_globals->_player, &scene->_objJacket, 0);
 		}
 	} else if ((action != CURSOR_LOOK) || (_globals->_inventory._jacket._sceneNumber != 1)) {
-		SceneHotspot_3::doAction(action);
+		NamedHotspot::doAction(action);
 	} else {
 		SceneItem::display(9850, 30, SET_Y, 20, SET_WIDTH, 200, SET_EXT_BGCOLOUR, 7, LIST_END);
 	}
@@ -1447,7 +1447,7 @@ void Scene9850::Hotspot16::doAction(int action) {
 			setAction(&scene->_sequenceManager, scene, 9859, &_globals->_player, &scene->_objCloak, 0);
 		}
 	} else if ((action != CURSOR_LOOK) || (_globals->_inventory._cloak._sceneNumber != 1)) {
-		SceneHotspot_3::doAction(action);
+		NamedHotspot::doAction(action);
 	} else {
 		SceneItem::display(9850, 30, SET_Y, 20, SET_WIDTH, 200, SET_EXT_BGCOLOUR, 7, LIST_END);
 	}
@@ -1461,7 +1461,7 @@ void Scene9850::Hotspot17::doAction(int action) {
 	} else {
 		if (action == CURSOR_USE)
 			scene->_soundHandler.startSound(306, 0, 127);
-		SceneHotspot_3::doAction(action);
+		NamedHotspot::doAction(action);
 	}
 }
 
@@ -1473,7 +1473,7 @@ void Scene9850::Hotspot18::doAction(int action) {
 	} else {
 		if (action == CURSOR_USE)
 			scene->_soundHandler.startSound(306, 0, 127);
-		SceneHotspot_3::doAction(action);
+		NamedHotspot::doAction(action);
 	}
 }
 
@@ -1485,7 +1485,7 @@ void Scene9850::Hotspot19::doAction(int action) {
 	} else {
 		if (action == CURSOR_USE)
 			scene->_soundHandler.startSound(313, 0, 127);
-		SceneHotspot_3::doAction(action);
+		NamedHotspot::doAction(action);
 	}
 }
 
@@ -1508,7 +1508,7 @@ void Scene9850::Hotspot20::doAction(int action) {
 		}
 		scene->_objSword._state ^= 1;
 	} else {
-		SceneHotspot_3::doAction(action);
+		NamedHotspot::doAction(action);
 	}
 }
 
diff --git a/engines/tsage/ringworld_scenes10.h b/engines/tsage/ringworld_scenes10.h
index 8eac21ac47..857ee94c80 100644
--- a/engines/tsage/ringworld_scenes10.h
+++ b/engines/tsage/ringworld_scenes10.h
@@ -46,14 +46,14 @@ public :
 	}
 };
 
-class SceneHotspot_3: public SceneHotspot {
+class NamedHotspot: public SceneHotspot {
 public:
 	int _resnum, _lookLineNum, _useLineNum;
-	SceneHotspot_3(): SceneHotspot() {}
+	NamedHotspot(): SceneHotspot() {}
 
 	void quickInit(const int ys, const int xe, const int ye, const int xs, const int resnum, const int lookLineNum, const int useLineNum);
 	virtual void doAction(int action);
-	virtual Common::String getClassName() { return "SceneHotspot_3"; }
+	virtual Common::String getClassName() { return "NamedHotspot"; }
 };
 
 class Object9350: public SceneObject {
@@ -64,7 +64,7 @@ public:
 
 class Scene9100: public Scene {
 	/* Items */
-	class SceneHotspot1: public SceneHotspot_3 {
+	class SceneHotspot1: public NamedHotspot {
 	public:
 		virtual void doAction(int action);
 	};
@@ -77,11 +77,11 @@ public:
 	SceneObject _object5;
 	SceneObject _object6;
 	SceneHotspot1  _sceneHotspot1;
-	SceneHotspot_3 _sceneHotspot2;
-	SceneHotspot_3 _sceneHotspot3;
-	SceneHotspot_3 _sceneHotspot4;
-	SceneHotspot_3 _sceneHotspot5;
-	SceneHotspot_3 _sceneHotspot6;
+	NamedHotspot _sceneHotspot2;
+	NamedHotspot _sceneHotspot3;
+	NamedHotspot _sceneHotspot4;
+	NamedHotspot _sceneHotspot5;
+	NamedHotspot _sceneHotspot6;
 
 	virtual void postInit(SceneObjectList *OwnerList = NULL);
 	virtual void signal();
@@ -100,16 +100,16 @@ public:
 	SceneObject _object1;
 	SceneObject _object2;
 	Object3 _object3;
-	SceneHotspot_3 _sceneHotspot1;
-	SceneHotspot_3 _sceneHotspot2;
-	SceneHotspot_3 _sceneHotspot3;
-	SceneHotspot_3 _sceneHotspot4;
-	SceneHotspot_3 _sceneHotspot5;
-	SceneHotspot_3 _sceneHotspot6;
-	SceneHotspot_3 _sceneHotspot7;
-	SceneHotspot_3 _sceneHotspot8;
-	SceneHotspot_3 _sceneHotspot9;
-	SceneHotspot_3 _sceneHotspot10;
+	NamedHotspot _sceneHotspot1;
+	NamedHotspot _sceneHotspot2;
+	NamedHotspot _sceneHotspot3;
+	NamedHotspot _sceneHotspot4;
+	NamedHotspot _sceneHotspot5;
+	NamedHotspot _sceneHotspot6;
+	NamedHotspot _sceneHotspot7;
+	NamedHotspot _sceneHotspot8;
+	NamedHotspot _sceneHotspot9;
+	NamedHotspot _sceneHotspot10;
 
 	virtual void postInit(SceneObjectList *OwnerList = NULL);
 	virtual void signal();
@@ -117,7 +117,7 @@ public:
 };
 
 class Scene9200: public Scene2 {
-	class SceneHotspot1: public SceneHotspot_3{
+	class SceneHotspot1: public NamedHotspot{
 	public:
 		virtual void doAction(int action);
 	};
@@ -132,13 +132,13 @@ public:
 	SpeakerQText _speakerQText;
 	SoundHandler _soundHandler;
 	SceneHotspot1 _hotspot1;
-	SceneHotspot_3 _hotspot2;
-	SceneHotspot_3 _hotspot3;
-	SceneHotspot_3 _hotspot4;
-	SceneHotspot_3 _hotspot5;
-	SceneHotspot_3 _hotspot6;
-	SceneHotspot_3 _hotspot7;
-	SceneHotspot_3 _hotspot8;
+	NamedHotspot _hotspot2;
+	NamedHotspot _hotspot3;
+	NamedHotspot _hotspot4;
+	NamedHotspot _hotspot5;
+	NamedHotspot _hotspot6;
+	NamedHotspot _hotspot7;
+	NamedHotspot _hotspot8;
 
 	virtual void postInit(SceneObjectList *OwnerList = NULL);
 	virtual void signal();
@@ -151,19 +151,19 @@ public:
 	SequenceManager _sequenceManager;
 	SceneObject _object1;
 	SceneObject _object2;
-	SceneHotspot_3 _hotspot1;
-	SceneHotspot_3 _hotspot2;
-	SceneHotspot_3 _hotspot3;
-	SceneHotspot_3 _hotspot4;
-	SceneHotspot_3 _hotspot5;
-	SceneHotspot_3 _hotspot6;
-	SceneHotspot_3 _hotspot7;
-	SceneHotspot_3 _hotspot8;
-	SceneHotspot_3 _hotspot9;
-	SceneHotspot_3 _hotspot10;
-	SceneHotspot_3 _hotspot11;
-	SceneHotspot_3 _hotspot12;
-	SceneHotspot_3 _hotspot13;
+	NamedHotspot _hotspot1;
+	NamedHotspot _hotspot2;
+	NamedHotspot _hotspot3;
+	NamedHotspot _hotspot4;
+	NamedHotspot _hotspot5;
+	NamedHotspot _hotspot6;
+	NamedHotspot _hotspot7;
+	NamedHotspot _hotspot8;
+	NamedHotspot _hotspot9;
+	NamedHotspot _hotspot10;
+	NamedHotspot _hotspot11;
+	NamedHotspot _hotspot12;
+	NamedHotspot _hotspot13;
 
 	virtual void postInit(SceneObjectList *OwnerList = NULL);
 	virtual void signal();
@@ -175,11 +175,11 @@ public:
 	SequenceManager _sequenceManager;
 	Object9350 _object1;
 	SceneObject _object2;
-	SceneHotspot_3 _sceneHotspot1;
-	SceneHotspot_3 _sceneHotspot2;
-	SceneHotspot_3 _sceneHotspot3;
-	SceneHotspot_3 _sceneHotspot4;
-	SceneHotspot_3 _sceneHotspot5;
+	NamedHotspot _sceneHotspot1;
+	NamedHotspot _sceneHotspot2;
+	NamedHotspot _sceneHotspot3;
+	NamedHotspot _sceneHotspot4;
+	NamedHotspot _sceneHotspot5;
 
 	virtual void postInit(SceneObjectList *OwnerList = NULL);
 	virtual void signal();
@@ -191,14 +191,14 @@ public:
 	SequenceManager _sequenceManager;
 	Action _action1;
 	Object9350 _object1;
-	SceneHotspot_3 _hotspot1;
-	SceneHotspot_3 _hotspot2;
-	SceneHotspot_3 _hotspot3;
-	SceneHotspot_3 _hotspot4;
-	SceneHotspot_3 _hotspot5;
-	SceneHotspot_3 _hotspot6;
-	SceneHotspot_3 _hotspot7;
-	SceneHotspot_3 _hotspot8;
+	NamedHotspot _hotspot1;
+	NamedHotspot _hotspot2;
+	NamedHotspot _hotspot3;
+	NamedHotspot _hotspot4;
+	NamedHotspot _hotspot5;
+	NamedHotspot _hotspot6;
+	NamedHotspot _hotspot7;
+	NamedHotspot _hotspot8;
 
 	virtual void postInit(SceneObjectList *OwnerList = NULL);
 	virtual void signal();
@@ -206,12 +206,12 @@ public:
 };
 
 class Scene9400: public Scene2 {
-	class SceneHotspot7: public SceneHotspot_3{
+	class SceneHotspot7: public NamedHotspot{
 	public:
 		virtual void doAction(int action);
 	};
 
-	class SceneHotspot8: public SceneHotspot_3{
+	class SceneHotspot8: public NamedHotspot{
 	public:
 		virtual void doAction(int action);
 	};
@@ -225,12 +225,12 @@ public:
 	SpeakerOText _speakerOText;
 	SpeakerOR _speakerOR;
 	SpeakerQText _speakerQText;
-	SceneHotspot_3 _hotspot1;
-	SceneHotspot_3 _hotspot2;
-	SceneHotspot_3 _hotspot3;
-	SceneHotspot_3 _hotspot4;
-	SceneHotspot_3 _hotspot5;
-	SceneHotspot_3 _hotspot6;
+	NamedHotspot _hotspot1;
+	NamedHotspot _hotspot2;
+	NamedHotspot _hotspot3;
+	NamedHotspot _hotspot4;
+	NamedHotspot _hotspot5;
+	NamedHotspot _hotspot6;
 	SoundHandler _soundHandler;
 	int _field1032;
 	SceneHotspot7 _hotspot7;
@@ -252,12 +252,12 @@ class Scene9450: public Scene2 {
 		virtual void dispatch();
 	};
 
-	class Hotspot1: public SceneHotspot_3{
+	class Hotspot1: public NamedHotspot{
 	public:
 		virtual void doAction(int action);
 	};
 
-	class Hotspot3: public SceneHotspot_3{
+	class Hotspot3: public NamedHotspot{
 	public:
 		virtual void doAction(int action);
 	};
@@ -269,21 +269,21 @@ public:
 	SequenceManager _sequenceManager3;
 	Object3 _object3;
 	Hotspot1 _hotspot1;
-	SceneHotspot_3 _hotspot2;
+	NamedHotspot _hotspot2;
 	Hotspot3 _hotspot3;
-	SceneHotspot_3 _hotspot4;
-	SceneHotspot_3 _hotspot5;
-	SceneHotspot_3 _hotspot6;
-	SceneHotspot_3 _hotspot7;
-	SceneHotspot_3 _hotspot8;
-	SceneHotspot_3 _hotspot9;
-	SceneHotspot_3 _hotspot10;
-	SceneHotspot_3 _hotspot11;
-	SceneHotspot_3 _hotspot12;
-	SceneHotspot_3 _hotspot13;
-	SceneHotspot_3 _hotspot14;
-	SceneHotspot_3 _hotspot15;
-	SceneHotspot_3 _hotspot16;
+	NamedHotspot _hotspot4;
+	NamedHotspot _hotspot5;
+	NamedHotspot _hotspot6;
+	NamedHotspot _hotspot7;
+	NamedHotspot _hotspot8;
+	NamedHotspot _hotspot9;
+	NamedHotspot _hotspot10;
+	NamedHotspot _hotspot11;
+	NamedHotspot _hotspot12;
+	NamedHotspot _hotspot13;
+	NamedHotspot _hotspot14;
+	NamedHotspot _hotspot15;
+	NamedHotspot _hotspot16;
 
 	virtual void postInit(SceneObjectList *OwnerList = NULL);
 	virtual void signal();
@@ -291,22 +291,22 @@ public:
 };
 
 class Scene9500: public Scene2 {
-	class Hotspot1: public SceneHotspot_3{
+	class Hotspot1: public NamedHotspot{
 	public:
 		virtual void doAction(int action);
 	};
 
-	class Hotspot2: public SceneHotspot_3{
+	class Hotspot2: public NamedHotspot{
 	public:
 		virtual void doAction(int action);
 	};
 
-	class Hotspot3: public SceneHotspot_3{
+	class Hotspot3: public NamedHotspot{
 	public:
 		virtual void doAction(int action);
 	};
 
-	class Hotspot4: public SceneHotspot_3{
+	class Hotspot4: public NamedHotspot{
 	public:
 		virtual void doAction(int action);
 	};
@@ -321,21 +321,21 @@ public:
 	Hotspot3 _hotspot3;
 	Hotspot4 _hotspot4;
 	Hotspot4 _hotspot5;
-	SceneHotspot_3 _hotspot6;
-	SceneHotspot_3 _hotspot7;
-	SceneHotspot_3 _hotspot8;
-	SceneHotspot_3 _hotspot9;
-	SceneHotspot_3 _hotspot10;
-	SceneHotspot_3 _hotspot11;
-	SceneHotspot_3 _hotspot12;
-	SceneHotspot_3 _hotspot13;
-	SceneHotspot_3 _hotspot14;
-	SceneHotspot_3 _hotspot15;
-	SceneHotspot_3 _hotspot16;
-	SceneHotspot_3 _hotspot17;
-	SceneHotspot_3 _hotspot18;
-	SceneHotspot_3 _hotspot19;
-	SceneHotspot_3 _hotspot20;
+	NamedHotspot _hotspot6;
+	NamedHotspot _hotspot7;
+	NamedHotspot _hotspot8;
+	NamedHotspot _hotspot9;
+	NamedHotspot _hotspot10;
+	NamedHotspot _hotspot11;
+	NamedHotspot _hotspot12;
+	NamedHotspot _hotspot13;
+	NamedHotspot _hotspot14;
+	NamedHotspot _hotspot15;
+	NamedHotspot _hotspot16;
+	NamedHotspot _hotspot17;
+	NamedHotspot _hotspot18;
+	NamedHotspot _hotspot19;
+	NamedHotspot _hotspot20;
 
 	virtual void postInit(SceneObjectList *OwnerList = NULL);
 	virtual void signal();
@@ -346,12 +346,12 @@ public:
 class Scene9700: public Scene2 {
 	SequenceManager _sequenceManager;
 	SceneObject _object1;
-	SceneHotspot_3 _sceneHotspot1;
-	SceneHotspot_3 _sceneHotspot2;
-	SceneHotspot_3 _sceneHotspot3;
-	SceneHotspot_3 _sceneHotspot4;
-	SceneHotspot_3 _sceneHotspot5;
-	SceneHotspot_3 _sceneHotspot6;
+	NamedHotspot _sceneHotspot1;
+	NamedHotspot _sceneHotspot2;
+	NamedHotspot _sceneHotspot3;
+	NamedHotspot _sceneHotspot4;
+	NamedHotspot _sceneHotspot5;
+	NamedHotspot _sceneHotspot6;
 	GfxButton _gfxButton1;
 
 	virtual void postInit(SceneObjectList *OwnerList = NULL);
@@ -381,37 +381,37 @@ class Scene9850: public Scene {
 		virtual void doAction(int action);
 	};
 
-	class Hotspot12: public SceneHotspot_3{
+	class Hotspot12: public NamedHotspot{
 	public:
 		virtual void doAction(int action);
 	};
 
-	class Hotspot14: public SceneHotspot_3{
+	class Hotspot14: public NamedHotspot{
 	public:
 		virtual void doAction(int action);
 	};
 
-	class Hotspot16: public SceneHotspot_3{
+	class Hotspot16: public NamedHotspot{
 	public:
 		virtual void doAction(int action);
 	};
 
-	class Hotspot17: public SceneHotspot_3{
+	class Hotspot17: public NamedHotspot{
 	public:
 		virtual void doAction(int action);
 	};
 
-	class Hotspot18: public SceneHotspot_3{
+	class Hotspot18: public NamedHotspot{
 	public:
 		virtual void doAction(int action);
 	};
 
-	class Hotspot19: public SceneHotspot_3{
+	class Hotspot19: public NamedHotspot{
 	public:
 		virtual void doAction(int action);
 	};
 
-	class Hotspot20: public SceneHotspot_3{
+	class Hotspot20: public NamedHotspot{
 	public:
 		virtual void doAction(int action);
 	};
@@ -425,21 +425,21 @@ public:
 	Object6 _objScimitar;
 	Object7 _objSword;
 	SoundHandler _soundHandler;
-	SceneHotspot_3 _hotspot1;
-	SceneHotspot_3 _hotspot2;
-	SceneHotspot_3 _hotspot3;
-	SceneHotspot_3 _hotspot4;
-	SceneHotspot_3 _hotspot5;
-	SceneHotspot_3 _hotspot6;
-	SceneHotspot_3 _hotspot7;
-	SceneHotspot_3 _hotspot8;
-	SceneHotspot_3 _hotspot9;
-	SceneHotspot_3 _hotspot10;
-	SceneHotspot_3 _hotspot11;
+	NamedHotspot _hotspot1;
+	NamedHotspot _hotspot2;
+	NamedHotspot _hotspot3;
+	NamedHotspot _hotspot4;
+	NamedHotspot _hotspot5;
+	NamedHotspot _hotspot6;
+	NamedHotspot _hotspot7;
+	NamedHotspot _hotspot8;
+	NamedHotspot _hotspot9;
+	NamedHotspot _hotspot10;
+	NamedHotspot _hotspot11;
 	Hotspot12 _hotspot12;
-	SceneHotspot_3 _hotspot13;
+	NamedHotspot _hotspot13;
 	Hotspot14 _hotspot14;
-	SceneHotspot_3 _hotspot15;
+	NamedHotspot _hotspot15;
 	Hotspot16 _hotspot16;
 	Hotspot17 _hotspot17;
 	Hotspot18 _hotspot18;