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

6 files changed, 49 insertions, 43 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