aboutsummaryrefslogtreecommitdiff
path: root/engines/tsage/ringworld/ringworld_logic.h
diff options
context:
space:
mode:
authorPaul Gilbert2011-08-15 19:26:15 +1000
committerPaul Gilbert2011-08-15 19:26:15 +1000
commit28aef23a60e4a1bb943a40e1087e2d0de69d9de1 (patch)
tree298ba9785ab0832c9771e4cec4123972db0cfa17 /engines/tsage/ringworld/ringworld_logic.h
parent833c6fdb72042b593d0bc23f8b9d223234e0ad8d (diff)
downloadscummvm-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/ringworld/ringworld_logic.h')
-rw-r--r--engines/tsage/ringworld/ringworld_logic.h10
1 files changed, 7 insertions, 3 deletions
diff --git a/engines/tsage/ringworld/ringworld_logic.h b/engines/tsage/ringworld/ringworld_logic.h
index 0ff5428e8a..66084c7915 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_Ringworld {
+namespace tSage {
+
+namespace Ringworld {
using namespace tSage;
@@ -440,7 +442,7 @@ public:
virtual Common::String getClassName() { return "RingworldInvObjectList"; }
};
-#define RING_INVENTORY (*((tSage_Ringworld::RingworldInvObjectList *)_globals->_inventory))
+#define RING_INVENTORY (*((::tSage::Ringworld::RingworldInvObjectList *)_globals->_inventory))
class RingworldGame: public Game {
protected:
@@ -458,6 +460,8 @@ public:
virtual void processEvent(Event &event);
};
-} // End of namespace tSage_Ringworld
+} // End of namespace Ringworld
+
+} // End of namespace tSage
#endif