TSAGE: Separated Ringworld and Blue Force game logic into their own namespaces

29 files changed, 136 insertions, 100 deletions

diff --git a/engines/tsage/blue_force/blueforce_logic.cpp b/engines/tsage/blue_force/blueforce_logic.cpp
index 5f635da02f..8facc6a9f3 100644
--- a/engines/tsage/blue_force/blueforce_logic.cpp
+++ b/engines/tsage/blue_force/blueforce_logic.cpp
@@ -27,7 +27,7 @@
 #include "tsage/tsage.h"
 #include "tsage/staticres.h"
 
-namespace tSage {
+namespace tSage_BlueForce {
 
 void BlueForceGame::start() {
 	// Start the game
@@ -41,17 +41,17 @@ Scene *BlueForceGame::createScene(int sceneNumber) {
 	/* Scene Group #0 */
 	case 20:
 		// Tsunami Title Screen
-		return new BF_Scene20();
+		return new Scene20();
 	case 50:
 	case 60:
 		error("Scene group 0 not implemented");
 	/* Scene Group #1 */
 	case 100:
 		// Tsnunami Title Screen #2
-		return new BF_Scene100();
+		return new Scene100();
 	case 109:
 		// Introduction Bar Room
-		return new BF_Scene109();
+		return new Scene109();
 	case 110:
 	case 114:
 	case 115:
@@ -247,4 +247,4 @@ void GameScene::remove() {
 }
 
 
-} // End of namespace tSage
+} // End of namespace tSage_BlueForce
diff --git a/engines/tsage/blue_force/blueforce_logic.h b/engines/tsage/blue_force/blueforce_logic.h
index 6cfbe9120a..7aa5ad864a 100644
--- a/engines/tsage/blue_force/blueforce_logic.h
+++ b/engines/tsage/blue_force/blueforce_logic.h
@@ -31,7 +31,9 @@
 
 #define BF_INTERFACE_Y 168
 
-namespace tSage {
+namespace tSage_BlueForce {
+
+using namespace tSage;
 
 class BlueForceGame: public Game {
 public:
@@ -87,6 +89,6 @@ public:
 };
 
 
-} // End of namespace tSage
+} // End of namespace tSage_BlueForce
 
 #endif
diff --git a/engines/tsage/blue_force/blueforce_scenes0.cpp b/engines/tsage/blue_force/blueforce_scenes0.cpp
index 5f271d4185..9a13480d5b 100644
--- a/engines/tsage/blue_force/blueforce_scenes0.cpp
+++ b/engines/tsage/blue_force/blueforce_scenes0.cpp
@@ -25,15 +25,15 @@
 #include "tsage/tsage.h"
 #include "tsage/staticres.h"
 
-namespace tSage {
+namespace tSage_BlueForce {
 
 /*--------------------------------------------------------------------------
  * Scene 20 - Tsunami Title Screen
  *
  *--------------------------------------------------------------------------*/
 
-void BF_Scene20::Action1::signal() {
-	BF_Scene20 *scene = (BF_Scene20 *)BF_GLOBALS._sceneManager._scene;
+void Scene20::Action1::signal() {
+	Scene20 *scene = (Scene20 *)BF_GLOBALS._sceneManager._scene;
 	static byte black[3] = { 0, 0, 0 };
 
 	switch (_actionIndex++) {
@@ -116,7 +116,7 @@ void BF_Scene20::Action1::signal() {
 
 /*--------------------------------------------------------------------------*/
 
-void BF_Scene20::postInit(SceneObjectList *OwnerList) {
+void Scene20::postInit(SceneObjectList *OwnerList) {
 	loadScene(20);
 	Scene::postInit();
 	setZoomPercents(60, 85, 200, 100);
@@ -191,4 +191,4 @@ void BF_Scene20::postInit(SceneObjectList *OwnerList) {
 	setAction(&_action1);
 }
 
-} // End of namespace tSage
+} // End of namespace tSage_BlueForce
diff --git a/engines/tsage/blue_force/blueforce_scenes0.h b/engines/tsage/blue_force/blueforce_scenes0.h
index 182a45fe49..f5535e037a 100644
--- a/engines/tsage/blue_force/blueforce_scenes0.h
+++ b/engines/tsage/blue_force/blueforce_scenes0.h
@@ -32,9 +32,11 @@
 #include "tsage/globals.h"
 #include "tsage/sound.h"
 
-namespace tSage {
+namespace tSage_BlueForce {
 
-class BF_Scene20 : public SceneExt {
+using namespace tSage;
+
+class Scene20 : public SceneExt {
 	/* Actions */
 	class Action1 : public Action {
 	private:
@@ -51,6 +53,6 @@ public:
 	virtual void postInit(SceneObjectList *OwnerList = NULL);
 };
 
-} // End of namespace tSage
+} // End of namespace tSage_BlueForce
 
 #endif
diff --git a/engines/tsage/blue_force/blueforce_scenes1.cpp b/engines/tsage/blue_force/blueforce_scenes1.cpp
index cdd8194b19..1346399f24 100644
--- a/engines/tsage/blue_force/blueforce_scenes1.cpp
+++ b/engines/tsage/blue_force/blueforce_scenes1.cpp
@@ -27,14 +27,14 @@
 #include "tsage/staticres.h"
 #include "tsage/globals.h"
 
-namespace tSage {
+namespace tSage_BlueForce {
 
 /*--------------------------------------------------------------------------
  * Scene 100 - Tsunami Title Screen #2
  *
  *--------------------------------------------------------------------------*/
 
-void BF_Scene100::Action1::signal() {
+void Scene100::Action1::signal() {
 	static byte black[3] = { 0, 0, 0 };
 
 	switch (_actionIndex++) {
@@ -69,7 +69,7 @@ void BF_Scene100::Action1::signal() {
 	}
 }
 
-void BF_Scene100::Action1::setTextStrings(const Common::String &msg1, const Common::String &msg2, Action *action) {
+void Scene100::Action1::setTextStrings(const Common::String &msg1, const Common::String &msg2, Action *action) {
 	// Set data for first text control
 	_sceneText1._fontNumber = 10;
 	_sceneText1._width = 160;
@@ -106,8 +106,8 @@ void BF_Scene100::Action1::setTextStrings(const Common::String &msg1, const Comm
 	_sceneText1.addMover(mover, &pt, action); 
 }
 
-void BF_Scene100::Action2::signal() {
-	BF_Scene100 *scene = (BF_Scene100 *)_globals->_sceneManager._scene;
+void Scene100::Action2::signal() {
+	Scene100 *scene = (Scene100 *)_globals->_sceneManager._scene;
 	static byte black[3] = {0, 0, 0};
 
 	switch (_actionIndex++) {
@@ -147,11 +147,11 @@ void BF_Scene100::Action2::signal() {
 
 /*--------------------------------------------------------------------------*/
 
-BF_Scene100::BF_Scene100(): Scene() {
+Scene100::Scene100(): Scene() {
 	_index = 0;
 }
 
-void BF_Scene100::postInit(SceneObjectList *OwnerList) {
+void Scene100::postInit(SceneObjectList *OwnerList) {
 	BF_GLOBALS._scenePalette.loadPalette(2);
 	BF_GLOBALS._v51C44 = 1;
 	Scene::postInit();
@@ -178,7 +178,7 @@ void BF_Scene100::postInit(SceneObjectList *OwnerList) {
 	setZoomPercents(60, 85, 200, 100);
 }
 
-void BF_Scene100::signal() {
+void Scene100::signal() {
 	++_sceneMode;
 	if (BF_GLOBALS._v4CEA2 < 6) {
 		BF_GLOBALS._scenePalette.clearListeners();
@@ -197,8 +197,8 @@ void BF_Scene100::signal() {
  *
  *--------------------------------------------------------------------------*/
 
-void BF_Scene109::Action1::signal() {
-	BF_Scene109 *scene = (BF_Scene109 *)BF_GLOBALS._sceneManager._scene;
+void Scene109::Action1::signal() {
+	Scene109 *scene = (Scene109 *)BF_GLOBALS._sceneManager._scene;
 
 	switch (_actionIndex++) {
 	case 0:
@@ -270,25 +270,25 @@ void BF_Scene109::Action1::signal() {
 	}
 }
 
-void BF_Scene109::Action2::signal() {
-	BF_Scene109 *scene = (BF_Scene109 *)BF_GLOBALS._sceneManager._scene;
+void Scene109::Action2::signal() {
+	Scene109 *scene = (Scene109 *)BF_GLOBALS._sceneManager._scene;
 	scene->setAction(&scene->_sequenceManager2, this, 3117, &scene->_object9, NULL);
 }
 
-void BF_Scene109::Action3::signal() {
-	BF_Scene109 *scene = (BF_Scene109 *)BF_GLOBALS._sceneManager._scene;
+void Scene109::Action3::signal() {
+	Scene109 *scene = (Scene109 *)BF_GLOBALS._sceneManager._scene;
 	scene->setAction(&scene->_sequenceManager3, this, 108, &scene->_drunk, NULL);
 }
 
 /*--------------------------------------------------------------------------*/
 
-BF_Scene109::Text::Text(): SceneText() {
+Scene109::Text::Text(): SceneText() {
 	_action = NULL;
 	_frameNumber = 0;
 	_diff = 0;
 }
 
-void BF_Scene109::Text::setup(const Common::String &msg, Action *action) {
+void Scene109::Text::setup(const Common::String &msg, Action *action) {
 	_frameNumber = BF_GLOBALS._events.getFrameNumber();
 	_diff = 180;
 	_action = action;
@@ -309,14 +309,14 @@ void BF_Scene109::Text::setup(const Common::String &msg, Action *action) {
 	_position.y = _bounds.top;
 }
 
-void BF_Scene109::Text::synchronize(Serializer &s) {
+void Scene109::Text::synchronize(Serializer &s) {
 	SceneText::synchronize(s);
 	SYNC_POINTER(_action);
 	s.syncAsUint32LE(_frameNumber);
 	s.syncAsSint16LE(_diff);
 }
 
-void BF_Scene109::Text::dispatch() {
+void Scene109::Text::dispatch() {
 	if (_diff) {
 		uint32 frameNumber = BF_GLOBALS._events.getFrameNumber();
 		if (_frameNumber < frameNumber) {
@@ -335,10 +335,10 @@ void BF_Scene109::Text::dispatch() {
 
 /*--------------------------------------------------------------------------*/
 
-BF_Scene109::BF_Scene109(): GameScene() {
+Scene109::Scene109(): GameScene() {
 }
 
-void BF_Scene109::postInit(SceneObjectList *OwnerList) {
+void Scene109::postInit(SceneObjectList *OwnerList) {
 	GameScene::postInit(OwnerList);
 	loadScene(999);
 
@@ -409,11 +409,11 @@ void BF_Scene109::postInit(SceneObjectList *OwnerList) {
 	setAction(&_action1, this);
 }
 
-void BF_Scene109::signal() {
+void Scene109::signal() {
 	if (_sceneMode == 1) {
 		BF_GLOBALS._scenePalette.clearListeners();
 		BF_GLOBALS._sceneManager.changeScene(110);
 	}
 }
 
-} // End of namespace tSage
+} // End of namespace tSage_BlueForce
diff --git a/engines/tsage/blue_force/blueforce_scenes1.h b/engines/tsage/blue_force/blueforce_scenes1.h
index 21c1ab4518..4d275ae89a 100644
--- a/engines/tsage/blue_force/blueforce_scenes1.h
+++ b/engines/tsage/blue_force/blueforce_scenes1.h
@@ -32,9 +32,11 @@
 #include "tsage/globals.h"
 #include "tsage/sound.h"
 
-namespace tSage {
+namespace tSage_BlueForce {
 
-class BF_Scene100: public Scene {
+using namespace tSage;
+
+class Scene100: public Scene {
 	/* Actions */
 	class Action1: public ActionExt {
 	private:
@@ -62,12 +64,12 @@ public:
 	SceneObjectExt2 _object1, _object2, _object3, _object4, _object5;
 	int _index;
 
-	BF_Scene100();
+	Scene100();
 	virtual void postInit(SceneObjectList *OwnerList = NULL);
 	virtual void signal();
 };
 
-class BF_Scene109: public GameScene {
+class Scene109: public GameScene {
 	/* Actions */
 	class Action1: public Action {
 	public:
@@ -107,12 +109,12 @@ public:
 	Action1 _action1;
 	Action _action2, _action3;
 public:
-	BF_Scene109();
+	Scene109();
 
 	virtual void postInit(SceneObjectList *OwnerList = NULL);
 	virtual void signal();
 };
 
-} // End of namespace tSage
+} // End of namespace tSage_BlueForce
 
 #endif
diff --git a/engines/tsage/globals.cpp b/engines/tsage/globals.cpp
index 0b74244b35..1de6912809 100644
--- a/engines/tsage/globals.cpp
+++ b/engines/tsage/globals.cpp
@@ -103,15 +103,15 @@ Globals::Globals() : _dialogCenter(160, 140), _gfxManagerInstance(_screenSurface
 	switch (_vm->getGameID()) {
 	case GType_Ringworld:
 		if (!(_vm->getFeatures() & GF_DEMO)) {
-			_inventory = new RingworldInvObjectList();
-			_game = new RingworldGame();
+			_inventory = new tSage_Ringworld::RingworldInvObjectList();
+			_game = new tSage_Ringworld::RingworldGame();
 		} else {
-			_game = new RingworldDemoGame();
+			_game = new tSage_Ringworld::RingworldDemoGame();
 		}
 		break;
 
 	case GType_BlueForce:
-		_game = new BlueForceGame();
+		_game = new tSage_BlueForce::BlueForceGame();
 		break;
 	}
 }
@@ -167,8 +167,12 @@ void Globals::dispatchSounds() {
 	Common::for_each(_sounds.begin(), _sounds.end(), Globals::dispatchSound);
 }
 
+} // end of namespace tSage
+
 /*--------------------------------------------------------------------------*/
 
+namespace tSage_BlueForce {
+
 BlueForceGlobals::BlueForceGlobals(): Globals() {
 	_v51C24 = 0;
 	_v51C44 = 1;
@@ -180,4 +184,4 @@ void BlueForceGlobals::synchronize(Serializer &s) {
 	error("Sync variables");
 }
 
-} // end of namespace tSage
+} // end of namespace tSage_BlueForce
diff --git a/engines/tsage/globals.h b/engines/tsage/globals.h
index a3d02ec787..d4c82c1d0f 100644
--- a/engines/tsage/globals.h
+++ b/engines/tsage/globals.h
@@ -96,6 +96,21 @@ public:
 	void dispatchSounds();
 };
 
+extern Globals *_globals;
+
+#define GLOBALS (*_globals)
+#define BF_GLOBALS (*((BlueForceGlobals *)_globals))
+
+// Note: Currently this can't be part of the _globals structure, since it needs to be constructed
+// prior to many of the fields in Globals execute their constructors
+extern ResourceManager *_resourceManager;
+
+} // end of namespace tSage
+
+namespace tSage_BlueForce {
+
+using namespace tSage;
+
 class BlueForceGlobals: public Globals {
 public:
 	ASound _sound1, _sound2, _sound3;
@@ -112,15 +127,6 @@ public:
 	virtual void synchronize(Serializer &s);
 };
 
-extern Globals *_globals;
-
-#define GLOBALS (*_globals)
-#define BF_GLOBALS (*((BlueForceGlobals *)_globals))
-
-// Note: Currently this can't be part of the _globals structure, since it needs to be constructed
-// prior to many of the fields in Globals execute their constructors
-extern ResourceManager *_resourceManager;
-
-} // End of namespace tSage
+} // End of namespace tSage_BlueForce
 
 #endif
diff --git a/engines/tsage/ringworld/ringworld_demo.cpp b/engines/tsage/ringworld/ringworld_demo.cpp
index ce06df8e80..02203e4ffe 100644
--- a/engines/tsage/ringworld/ringworld_demo.cpp
+++ b/engines/tsage/ringworld/ringworld_demo.cpp
@@ -25,7 +25,7 @@
 #include "tsage/tsage.h"
 #include "tsage/staticres.h"
 
-namespace tSage {
+namespace tSage_Ringworld {
 
 void RingworldDemoGame::start() {
 	// Start the demo's single scene
@@ -117,4 +117,4 @@ void RingworldDemoScene::process(Event &event) {
 
 }
 
-} // End of namespace tSage
+} // End of namespace tSage_Ringworld
diff --git a/engines/tsage/ringworld/ringworld_demo.h b/engines/tsage/ringworld/ringworld_demo.h
index 3e7431e107..f9c9fcbfa1 100644
--- a/engines/tsage/ringworld/ringworld_demo.h
+++ b/engines/tsage/ringworld/ringworld_demo.h
@@ -30,7 +30,9 @@
 #include "tsage/globals.h"
 #include "tsage/sound.h"
 
-namespace tSage {
+namespace tSage_Ringworld {
+
+using namespace tSage;
 
 class RingworldDemoGame: public Game {
 private:
@@ -54,6 +56,6 @@ public:
 	virtual void signal();
 };
 
-} // End of namespace tSage
+} // End of namespace tSage_Ringworld
 
 #endif
diff --git a/engines/tsage/ringworld/ringworld_logic.cpp b/engines/tsage/ringworld/ringworld_logic.cpp
index 99890c90ff..8bf0ded996 100644
--- a/engines/tsage/ringworld/ringworld_logic.cpp
+++ b/engines/tsage/ringworld/ringworld_logic.cpp
@@ -37,7 +37,7 @@
 #include "tsage/ringworld/ringworld_scenes8.h"
 #include "tsage/ringworld/ringworld_scenes10.h"
 
-namespace tSage {
+namespace tSage_Ringworld {
 
 Scene *RingworldGame::createScene(int sceneNumber) {
 	switch (sceneNumber) {
@@ -1487,4 +1487,4 @@ void RingworldGame::processEvent(Event &event) {
 	}
 }
 
-} // End of namespace tSage
+} // End of namespace tSage_Ringworld
diff --git a/engines/tsage/ringworld/ringworld_logic.h b/engines/tsage/ringworld/ringworld_logic.h
index 19b0f10b42..0ff5428e8a 100644
--- a/engines/tsage/ringworld/ringworld_logic.h
+++ b/engines/tsage/ringworld/ringworld_logic.h
@@ -29,7 +29,9 @@
 #include "tsage/scenes.h"
 #include "tsage/globals.h"
 
-namespace tSage {
+namespace tSage_Ringworld {
+
+using namespace tSage;
 
 #define ADD_PLAYER_MOVER(X, Y) { Common::Point pt(X, Y); PlayerMover *mover = new PlayerMover(); \
 	_globals->_player.addMover(mover, &pt, this); }
@@ -438,7 +440,7 @@ public:
 	virtual Common::String getClassName() { return "RingworldInvObjectList"; }
 };
 
-#define RING_INVENTORY (*((RingworldInvObjectList *)_globals->_inventory))
+#define RING_INVENTORY (*((tSage_Ringworld::RingworldInvObjectList *)_globals->_inventory))
 
 class RingworldGame: public Game {
 protected:
@@ -456,6 +458,6 @@ public:
 	virtual void processEvent(Event &event);
 };
 
-} // End of namespace tSage
+} // End of namespace tSage_Ringworld
 
 #endif
diff --git a/engines/tsage/ringworld/ringworld_scenes1.cpp b/engines/tsage/ringworld/ringworld_scenes1.cpp
index 880fa51e6e..c87b9ab972 100644
--- a/engines/tsage/ringworld/ringworld_scenes1.cpp
+++ b/engines/tsage/ringworld/ringworld_scenes1.cpp
@@ -25,7 +25,7 @@
 #include "tsage/tsage.h"
 #include "tsage/staticres.h"
 
-namespace tSage {
+namespace tSage_Ringworld {
 
 /*--------------------------------------------------------------------------
  * Scene 10 - Kziniti Palace (Introduction)
@@ -3342,4 +3342,4 @@ void Scene6100::showMessage(const Common::String &msg, int color, Action *action
 	}
 }
 
-} // End of namespace tSage
+} // End of namespace tSage_Ringworld
diff --git a/engines/tsage/ringworld/ringworld_scenes1.h b/engines/tsage/ringworld/ringworld_scenes1.h
index dd64e563cd..7d93eb6483 100644
--- a/engines/tsage/ringworld/ringworld_scenes1.h
+++ b/engines/tsage/ringworld/ringworld_scenes1.h
@@ -32,7 +32,9 @@
 #include "tsage/globals.h"
 #include "tsage/sound.h"
 
-namespace tSage {
+namespace tSage_Ringworld {
+
+using namespace tSage;
 
 class Scene10 : public Scene {
 	/* Actions */
@@ -533,6 +535,6 @@ public:
 
 };
 
-} // End of namespace tSage
+} // End of namespace tSage_Ringworld
 
 #endif
diff --git a/engines/tsage/ringworld/ringworld_scenes10.cpp b/engines/tsage/ringworld/ringworld_scenes10.cpp
index 1cff5d0aaf..e7461ba10e 100644
--- a/engines/tsage/ringworld/ringworld_scenes10.cpp
+++ b/engines/tsage/ringworld/ringworld_scenes10.cpp
@@ -26,7 +26,7 @@
 #include "tsage/tsage.h"
 #include "tsage/staticres.h"
 
-namespace tSage {
+namespace tSage_Ringworld {
 
 Scene2::Scene2() : Scene() {
 	_sceneState = 0;
@@ -2086,4 +2086,4 @@ void Scene9999::postInit(SceneObjectList *OwnerList) {
 
 }
 
-} // End of namespace tSage
+} // End of namespace tSage_Ringworld
diff --git a/engines/tsage/ringworld/ringworld_scenes10.h b/engines/tsage/ringworld/ringworld_scenes10.h
index 792234cc91..54a3bfcdd0 100644
--- a/engines/tsage/ringworld/ringworld_scenes10.h
+++ b/engines/tsage/ringworld/ringworld_scenes10.h
@@ -30,7 +30,9 @@
 #include "tsage/scenes.h"
 #include "tsage/globals.h"
 
-namespace tSage {
+namespace tSage_Ringworld {
+
+using namespace tSage;
 
 class SceneObject9150 : public SceneObject {
 public:
@@ -527,6 +529,6 @@ public:
 };
 
 
-} // End of namespace tSage
+} // End of namespace tSage_Ringworld
 
 #endif
diff --git a/engines/tsage/ringworld/ringworld_scenes2.cpp b/engines/tsage/ringworld/ringworld_scenes2.cpp
index 2dadaf4c30..7091a9510c 100644
--- a/engines/tsage/ringworld/ringworld_scenes2.cpp
+++ b/engines/tsage/ringworld/ringworld_scenes2.cpp
@@ -26,7 +26,7 @@
 #include "tsage/tsage.h"
 #include "tsage/staticres.h"
 
-namespace tSage {
+namespace tSage_Ringworld {
 
 /*--------------------------------------------------------------------------
  * Scene 1000 - Title Screen
@@ -925,4 +925,4 @@ void Scene1500::postInit(SceneObjectList *OwnerList) {
 	}
 }
 
-} // End of namespace tSage
+} // End of namespace tSage_Ringworld
diff --git a/engines/tsage/ringworld/ringworld_scenes2.h b/engines/tsage/ringworld/ringworld_scenes2.h
index ef3158bbb9..c066c41633 100644
--- a/engines/tsage/ringworld/ringworld_scenes2.h
+++ b/engines/tsage/ringworld/ringworld_scenes2.h
@@ -30,7 +30,9 @@
 #include "tsage/scenes.h"
 #include "tsage/globals.h"
 
-namespace tSage {
+namespace tSage_Ringworld {
+
+using namespace tSage;
 
 class Scene1000 : public Scene {
 	/* Actions */
@@ -144,6 +146,6 @@ public:
 
 
 
-} // End of namespace tSage
+} // End of namespace tSage_Ringworld
 
 #endif
diff --git a/engines/tsage/ringworld/ringworld_scenes3.cpp b/engines/tsage/ringworld/ringworld_scenes3.cpp
index 3d8f151c35..238652f4dd 100644
--- a/engines/tsage/ringworld/ringworld_scenes3.cpp
+++ b/engines/tsage/ringworld/ringworld_scenes3.cpp
@@ -26,7 +26,7 @@
 #include "tsage/tsage.h"
 #include "tsage/staticres.h"
 
-namespace tSage {
+namespace tSage_Ringworld {
 
 /*--------------------------------------------------------------------------
  * Scene 2000 - Cockpit cutscenes
@@ -6130,4 +6130,4 @@ void Scene2400::postInit(SceneObjectList *OwnerList) {
 	_globals->_soundHandler.play(153);
 }
 
-} // End of namespace tSage
+} // End of namespace tSage_Ringworld
diff --git a/engines/tsage/ringworld/ringworld_scenes3.h b/engines/tsage/ringworld/ringworld_scenes3.h
index 4f8f559091..bd8fe28d43 100644
--- a/engines/tsage/ringworld/ringworld_scenes3.h
+++ b/engines/tsage/ringworld/ringworld_scenes3.h
@@ -28,7 +28,9 @@
 #include "tsage/converse.h"
 #include "tsage/ringworld/ringworld_logic.h"
 
-namespace tSage {
+namespace tSage_Ringworld {
+
+using namespace tSage;
 
 class Scene2000 : public Scene {
 	/* Actions */
@@ -890,6 +892,6 @@ public:
 	virtual void postInit(SceneObjectList *OwnerList = NULL);
 };
 
-} // End of namespace tSage
+} // End of namespace tSage_Ringworld
 
 #endif
diff --git a/engines/tsage/ringworld/ringworld_scenes4.cpp b/engines/tsage/ringworld/ringworld_scenes4.cpp
index 83dd559a6d..543c17b693 100644
--- a/engines/tsage/ringworld/ringworld_scenes4.cpp
+++ b/engines/tsage/ringworld/ringworld_scenes4.cpp
@@ -26,7 +26,7 @@
 #include "tsage/tsage.h"
 #include "tsage/staticres.h"
 
-namespace tSage {
+namespace tSage_Ringworld {
 
 /*--------------------------------------------------------------------------
  * Scene 3500 - Ringworld Scan
@@ -247,4 +247,4 @@ void Scene3700::postInit(tSage::SceneObjectList *OwnerList) {
 	_globals->_soundHandler.play(195);
 }
 
-} // End of namespace tSage
+} // End of namespace tSage_Ringworld
diff --git a/engines/tsage/ringworld/ringworld_scenes4.h b/engines/tsage/ringworld/ringworld_scenes4.h
index 6c706d2dab..ccad604204 100644
--- a/engines/tsage/ringworld/ringworld_scenes4.h
+++ b/engines/tsage/ringworld/ringworld_scenes4.h
@@ -28,7 +28,9 @@
 #include "tsage/converse.h"
 #include "tsage/ringworld/ringworld_logic.h"
 
-namespace tSage {
+namespace tSage_Ringworld {
+
+using namespace tSage;
 
 class Scene3500 : public Scene {
 	/* Actions */
@@ -87,6 +89,6 @@ public:
 	virtual void postInit(SceneObjectList *OwnerList = NULL);
 };
 
-} // End of namespace tSage
+} // End of namespace tSage_Ringworld
 
 #endif
diff --git a/engines/tsage/ringworld/ringworld_scenes5.cpp b/engines/tsage/ringworld/ringworld_scenes5.cpp
index 0803a2039a..bdb04161ad 100644
--- a/engines/tsage/ringworld/ringworld_scenes5.cpp
+++ b/engines/tsage/ringworld/ringworld_scenes5.cpp
@@ -26,7 +26,7 @@
 #include "tsage/tsage.h"
 #include "tsage/staticres.h"
 
-namespace tSage {
+namespace tSage_Ringworld {
 
 /*--------------------------------------------------------------------------
  * Scene 4000 - Village
@@ -4438,4 +4438,4 @@ void Scene4301::dispatch() {
 	}
 }
 
-} // End of namespace tSage
+} // End of namespace tSage_Ringworld
diff --git a/engines/tsage/ringworld/ringworld_scenes5.h b/engines/tsage/ringworld/ringworld_scenes5.h
index d28e809678..49e4b95dba 100644
--- a/engines/tsage/ringworld/ringworld_scenes5.h
+++ b/engines/tsage/ringworld/ringworld_scenes5.h
@@ -28,7 +28,9 @@
 #include "tsage/converse.h"
 #include "tsage/ringworld/ringworld_logic.h"
 
-namespace tSage {
+namespace tSage_Ringworld {
+
+using namespace tSage;
 
 class Scene4000 : public Scene {
 	/* Actions */
@@ -688,6 +690,6 @@ public:
 };
 
 
-} // End of namespace tSage
+} // End of namespace tSage_Ringworld
 
 #endif
diff --git a/engines/tsage/ringworld/ringworld_scenes6.cpp b/engines/tsage/ringworld/ringworld_scenes6.cpp
index 6b335fe7c3..f1b7310938 100644
--- a/engines/tsage/ringworld/ringworld_scenes6.cpp
+++ b/engines/tsage/ringworld/ringworld_scenes6.cpp
@@ -25,7 +25,7 @@
 #include "tsage/tsage.h"
 #include "tsage/staticres.h"
 
-namespace tSage {
+namespace tSage_Ringworld {
 
 /*--------------------------------------------------------------------------
  * Scene 5000 - Caverns - Entrance
@@ -2197,4 +2197,4 @@ void Scene5300::signal() {
 }
 
 
-} // End of namespace tSage
+} // End of namespace tSage_Ringworld
diff --git a/engines/tsage/ringworld/ringworld_scenes6.h b/engines/tsage/ringworld/ringworld_scenes6.h
index db6efd0e18..976c477077 100644
--- a/engines/tsage/ringworld/ringworld_scenes6.h
+++ b/engines/tsage/ringworld/ringworld_scenes6.h
@@ -30,7 +30,9 @@
 #include "tsage/scenes.h"
 #include "tsage/globals.h"
 
-namespace tSage {
+namespace tSage_Ringworld {
+
+using namespace tSage;
 
 class Scene5000 : public Scene {
 	/* Actions */
@@ -325,6 +327,6 @@ public:
 };
 
 
-} // End of namespace tSage
+} // End of namespace tSage_Ringworld
 
 #endif
diff --git a/engines/tsage/ringworld/ringworld_scenes8.cpp b/engines/tsage/ringworld/ringworld_scenes8.cpp
index 5b01bb2c58..15f469afea 100644
--- a/engines/tsage/ringworld/ringworld_scenes8.cpp
+++ b/engines/tsage/ringworld/ringworld_scenes8.cpp
@@ -26,7 +26,7 @@
 #include "tsage/tsage.h"
 #include "tsage/staticres.h"
 
-namespace tSage {
+namespace tSage_Ringworld {
 
 void NamedHotspotMult::synchronize(Serializer &s) {
 	SceneHotspot::synchronize(s);
@@ -2542,4 +2542,4 @@ void Scene7700::synchronize(Serializer &s) {
 	}
 }
 
-} // End of namespace tSage
+} // End of namespace tSage_Ringworld
diff --git a/engines/tsage/ringworld/ringworld_scenes8.h b/engines/tsage/ringworld/ringworld_scenes8.h
index e4f82fc164..defb2870f1 100644
--- a/engines/tsage/ringworld/ringworld_scenes8.h
+++ b/engines/tsage/ringworld/ringworld_scenes8.h
@@ -30,7 +30,9 @@
 #include "tsage/scenes.h"
 #include "tsage/globals.h"
 
-namespace tSage {
+namespace tSage_Ringworld {
+
+using namespace tSage;
 
 class NamedHotspotMult : public SceneHotspot {
 public:
@@ -485,6 +487,6 @@ public:
 	virtual void synchronize(Serializer &s);
 };
 
-} // End of namespace tSage
+} // End of namespace tSage_Ringworld
 
 #endif
diff --git a/engines/tsage/tsage.cpp b/engines/tsage/tsage.cpp
index 3332841188..9cf462c164 100644
--- a/engines/tsage/tsage.cpp
+++ b/engines/tsage/tsage.cpp
@@ -81,7 +81,7 @@ void TSageEngine::initialize() {
 			_resourceManager->addLib("FILES.RLB");
 			_resourceManager->addLib("TSAGE.RLB");
 		}
-		_globals = new BlueForceGlobals();
+		_globals = new tSage_BlueForce::BlueForceGlobals();
 	}
 
 	_globals->gfxManager().setDefaults();