diff options
author | Paul Gilbert | 2011-08-15 19:26:15 +1000 |
---|---|---|
committer | Paul Gilbert | 2011-08-15 19:26:15 +1000 |
commit | 28aef23a60e4a1bb943a40e1087e2d0de69d9de1 (patch) | |
tree | 298ba9785ab0832c9771e4cec4123972db0cfa17 /engines/tsage/blue_force | |
parent | 833c6fdb72042b593d0bc23f8b9d223234e0ad8d (diff) | |
download | scummvm-rg350-28aef23a60e4a1bb943a40e1087e2d0de69d9de1.tar.gz scummvm-rg350-28aef23a60e4a1bb943a40e1087e2d0de69d9de1.tar.bz2 scummvm-rg350-28aef23a60e4a1bb943a40e1087e2d0de69d9de1.zip |
TSAGE: Changed Ringworld/Blue Force namespaces to be embedded namespaces within tSage
Diffstat (limited to 'engines/tsage/blue_force')
-rw-r--r-- | engines/tsage/blue_force/blueforce_logic.cpp | 7 | ||||
-rw-r--r-- | engines/tsage/blue_force/blueforce_logic.h | 7 | ||||
-rw-r--r-- | engines/tsage/blue_force/blueforce_scenes0.cpp | 7 | ||||
-rw-r--r-- | engines/tsage/blue_force/blueforce_scenes0.h | 8 | ||||
-rw-r--r-- | engines/tsage/blue_force/blueforce_scenes1.cpp | 8 | ||||
-rw-r--r-- | engines/tsage/blue_force/blueforce_scenes1.h | 8 |
6 files changed, 33 insertions, 12 deletions
diff --git a/engines/tsage/blue_force/blueforce_logic.cpp b/engines/tsage/blue_force/blueforce_logic.cpp index 8facc6a9f3..a29d677fb1 100644 --- a/engines/tsage/blue_force/blueforce_logic.cpp +++ b/engines/tsage/blue_force/blueforce_logic.cpp @@ -27,7 +27,9 @@ #include "tsage/tsage.h" #include "tsage/staticres.h" -namespace tSage_BlueForce { +namespace tSage { + +namespace BlueForce { void BlueForceGame::start() { // Start the game @@ -246,5 +248,6 @@ void GameScene::remove() { BF_GLOBALS._scenePalette._field412 = 1; } +} // End of namespace BlueForce -} // End of namespace tSage_BlueForce +} // End of namespace tSage diff --git a/engines/tsage/blue_force/blueforce_logic.h b/engines/tsage/blue_force/blueforce_logic.h index 7aa5ad864a..e870fa1430 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_BlueForce { +namespace tSage { + +namespace BlueForce { using namespace tSage; @@ -88,7 +90,8 @@ class BlueAnimatedSpeaker: public Speaker { public: }; +} // End of namespace BlueForce -} // End of namespace tSage_BlueForce +} // End of namespace tSage #endif diff --git a/engines/tsage/blue_force/blueforce_scenes0.cpp b/engines/tsage/blue_force/blueforce_scenes0.cpp index b5392635a3..a47d7d712f 100644 --- a/engines/tsage/blue_force/blueforce_scenes0.cpp +++ b/engines/tsage/blue_force/blueforce_scenes0.cpp @@ -25,7 +25,9 @@ #include "tsage/tsage.h" #include "tsage/staticres.h" -namespace tSage_BlueForce { +namespace tSage { + +namespace BlueForce { /*-------------------------------------------------------------------------- * Scene 20 - Tsunami Title Screen @@ -237,5 +239,6 @@ void Scene50::Tooltip2::dispatch() { /*--------------------------------------------------------------------------*/ +} // End of namespace BlueForce -} // End of namespace tSage_BlueForce +} // End of namespace tSage diff --git a/engines/tsage/blue_force/blueforce_scenes0.h b/engines/tsage/blue_force/blueforce_scenes0.h index 766b9f0295..7eda443ee9 100644 --- a/engines/tsage/blue_force/blueforce_scenes0.h +++ b/engines/tsage/blue_force/blueforce_scenes0.h @@ -32,7 +32,9 @@ #include "tsage/globals.h" #include "tsage/sound.h" -namespace tSage_BlueForce { +namespace tSage { + +namespace BlueForce { using namespace tSage; @@ -78,6 +80,8 @@ public: }; -} // End of namespace tSage_BlueForce +} // End of namespace BlueForce + +} // End of namespace tSage #endif diff --git a/engines/tsage/blue_force/blueforce_scenes1.cpp b/engines/tsage/blue_force/blueforce_scenes1.cpp index 1346399f24..1dafff2bce 100644 --- a/engines/tsage/blue_force/blueforce_scenes1.cpp +++ b/engines/tsage/blue_force/blueforce_scenes1.cpp @@ -27,7 +27,9 @@ #include "tsage/staticres.h" #include "tsage/globals.h" -namespace tSage_BlueForce { +namespace tSage { + +namespace BlueForce { /*-------------------------------------------------------------------------- * Scene 100 - Tsunami Title Screen #2 @@ -416,4 +418,6 @@ void Scene109::signal() { } } -} // End of namespace tSage_BlueForce +} // End of namespace BlueForce + +} // End of namespace tSage diff --git a/engines/tsage/blue_force/blueforce_scenes1.h b/engines/tsage/blue_force/blueforce_scenes1.h index 4d275ae89a..86ca4a9f14 100644 --- a/engines/tsage/blue_force/blueforce_scenes1.h +++ b/engines/tsage/blue_force/blueforce_scenes1.h @@ -32,7 +32,9 @@ #include "tsage/globals.h" #include "tsage/sound.h" -namespace tSage_BlueForce { +namespace tSage { + +namespace BlueForce { using namespace tSage; @@ -115,6 +117,8 @@ public: virtual void signal(); }; -} // End of namespace tSage_BlueForce +} // End of namespace BlueForce + +} // End of namespace tSage #endif |