aboutsummaryrefslogtreecommitdiff
path: root/engines/tsage/ringworld
diff options
context:
space:
mode:
Diffstat (limited to 'engines/tsage/ringworld')
-rw-r--r--engines/tsage/ringworld/ringworld_demo.cpp4
-rw-r--r--engines/tsage/ringworld/ringworld_demo.h6
-rw-r--r--engines/tsage/ringworld/ringworld_logic.cpp4
-rw-r--r--engines/tsage/ringworld/ringworld_logic.h8
-rw-r--r--engines/tsage/ringworld/ringworld_scenes1.cpp4
-rw-r--r--engines/tsage/ringworld/ringworld_scenes1.h6
-rw-r--r--engines/tsage/ringworld/ringworld_scenes10.cpp4
-rw-r--r--engines/tsage/ringworld/ringworld_scenes10.h6
-rw-r--r--engines/tsage/ringworld/ringworld_scenes2.cpp4
-rw-r--r--engines/tsage/ringworld/ringworld_scenes2.h6
-rw-r--r--engines/tsage/ringworld/ringworld_scenes3.cpp4
-rw-r--r--engines/tsage/ringworld/ringworld_scenes3.h6
-rw-r--r--engines/tsage/ringworld/ringworld_scenes4.cpp6
-rw-r--r--engines/tsage/ringworld/ringworld_scenes4.h6
-rw-r--r--engines/tsage/ringworld/ringworld_scenes5.cpp6
-rw-r--r--engines/tsage/ringworld/ringworld_scenes5.h6
-rw-r--r--engines/tsage/ringworld/ringworld_scenes6.cpp4
-rw-r--r--engines/tsage/ringworld/ringworld_scenes6.h6
-rw-r--r--engines/tsage/ringworld/ringworld_scenes8.cpp4
-rw-r--r--engines/tsage/ringworld/ringworld_scenes8.h6
20 files changed, 53 insertions, 53 deletions
diff --git a/engines/tsage/ringworld/ringworld_demo.cpp b/engines/tsage/ringworld/ringworld_demo.cpp
index 08cb88536c..5612325aff 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 {
namespace Ringworld {
@@ -121,4 +121,4 @@ void RingworldDemoScene::process(Event &event) {
} // End of namespace Ringworld
-} // End of namespace tSage
+} // End of namespace TsAGE
diff --git a/engines/tsage/ringworld/ringworld_demo.h b/engines/tsage/ringworld/ringworld_demo.h
index 13a33f85d6..30527b0aea 100644
--- a/engines/tsage/ringworld/ringworld_demo.h
+++ b/engines/tsage/ringworld/ringworld_demo.h
@@ -30,11 +30,11 @@
#include "tsage/globals.h"
#include "tsage/sound.h"
-namespace tSage {
+namespace TsAGE {
namespace Ringworld {
-using namespace tSage;
+using namespace TsAGE;
class RingworldDemoGame: public Game {
private:
@@ -60,6 +60,6 @@ public:
} // End of namespace Ringworld
-} // End of namespace tSage
+} // End of namespace TsAGE
#endif
diff --git a/engines/tsage/ringworld/ringworld_logic.cpp b/engines/tsage/ringworld/ringworld_logic.cpp
index 94b8bccfd0..d6e72fe95c 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 {
namespace Ringworld {
@@ -1491,4 +1491,4 @@ void RingworldGame::processEvent(Event &event) {
} // End of namespace Ringworld
-} // End of namespace tSage
+} // End of namespace TsAGE
diff --git a/engines/tsage/ringworld/ringworld_logic.h b/engines/tsage/ringworld/ringworld_logic.h
index 66084c7915..73ecc9722b 100644
--- a/engines/tsage/ringworld/ringworld_logic.h
+++ b/engines/tsage/ringworld/ringworld_logic.h
@@ -29,11 +29,11 @@
#include "tsage/scenes.h"
#include "tsage/globals.h"
-namespace tSage {
+namespace TsAGE {
namespace Ringworld {
-using namespace tSage;
+using namespace TsAGE;
#define ADD_PLAYER_MOVER(X, Y) { Common::Point pt(X, Y); PlayerMover *mover = new PlayerMover(); \
_globals->_player.addMover(mover, &pt, this); }
@@ -442,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:
@@ -462,6 +462,6 @@ public:
} // End of namespace Ringworld
-} // End of namespace tSage
+} // End of namespace TsAGE
#endif
diff --git a/engines/tsage/ringworld/ringworld_scenes1.cpp b/engines/tsage/ringworld/ringworld_scenes1.cpp
index ca16b785c4..332aef6d8d 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 {
namespace Ringworld {
@@ -3346,4 +3346,4 @@ void Scene6100::showMessage(const Common::String &msg, int color, Action *action
} // End of namespace Ringworld
-} // End of namespace tSage
+} // End of namespace TsAGE
diff --git a/engines/tsage/ringworld/ringworld_scenes1.h b/engines/tsage/ringworld/ringworld_scenes1.h
index ed8b0e48f7..49ea65eb3a 100644
--- a/engines/tsage/ringworld/ringworld_scenes1.h
+++ b/engines/tsage/ringworld/ringworld_scenes1.h
@@ -32,11 +32,11 @@
#include "tsage/globals.h"
#include "tsage/sound.h"
-namespace tSage {
+namespace TsAGE {
namespace Ringworld {
-using namespace tSage;
+using namespace TsAGE;
class Scene10 : public Scene {
/* Actions */
@@ -539,6 +539,6 @@ public:
} // End of namespace Ringworld
-} // End of namespace tSage
+} // End of namespace TsAGE
#endif
diff --git a/engines/tsage/ringworld/ringworld_scenes10.cpp b/engines/tsage/ringworld/ringworld_scenes10.cpp
index 160d829285..df25c324ab 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 {
namespace Ringworld {
@@ -2090,4 +2090,4 @@ void Scene9999::postInit(SceneObjectList *OwnerList) {
} // End of namespace Ringworld
-} // End of namespace tSage
+} // End of namespace TsAGE
diff --git a/engines/tsage/ringworld/ringworld_scenes10.h b/engines/tsage/ringworld/ringworld_scenes10.h
index e796fb5085..02c42f3d01 100644
--- a/engines/tsage/ringworld/ringworld_scenes10.h
+++ b/engines/tsage/ringworld/ringworld_scenes10.h
@@ -30,11 +30,11 @@
#include "tsage/scenes.h"
#include "tsage/globals.h"
-namespace tSage {
+namespace TsAGE {
namespace Ringworld {
-using namespace tSage;
+using namespace TsAGE;
class SceneObject9150 : public SceneObject {
public:
@@ -532,6 +532,6 @@ public:
} // End of namespace Ringworld
-} // End of namespace tSage
+} // End of namespace TsAGE
#endif
diff --git a/engines/tsage/ringworld/ringworld_scenes2.cpp b/engines/tsage/ringworld/ringworld_scenes2.cpp
index 63d0d4af14..cfd3e3d8f7 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 {
namespace Ringworld {
@@ -929,4 +929,4 @@ void Scene1500::postInit(SceneObjectList *OwnerList) {
} // End of namespace Ringworld
-} // End of namespace tSage
+} // End of namespace TsAGE
diff --git a/engines/tsage/ringworld/ringworld_scenes2.h b/engines/tsage/ringworld/ringworld_scenes2.h
index 08654b0c80..3502aea15b 100644
--- a/engines/tsage/ringworld/ringworld_scenes2.h
+++ b/engines/tsage/ringworld/ringworld_scenes2.h
@@ -30,11 +30,11 @@
#include "tsage/scenes.h"
#include "tsage/globals.h"
-namespace tSage {
+namespace TsAGE {
namespace Ringworld {
-using namespace tSage;
+using namespace TsAGE;
class Scene1000 : public Scene {
/* Actions */
@@ -148,6 +148,6 @@ public:
} // End of namespace Ringworld
-} // End of namespace tSage
+} // End of namespace TsAGE
#endif
diff --git a/engines/tsage/ringworld/ringworld_scenes3.cpp b/engines/tsage/ringworld/ringworld_scenes3.cpp
index 7f9e41fbc5..f744a98c33 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 {
namespace Ringworld {
@@ -6134,4 +6134,4 @@ void Scene2400::postInit(SceneObjectList *OwnerList) {
} // End of namespace Ringworld
-} // End of namespace tSage
+} // End of namespace TsAGE
diff --git a/engines/tsage/ringworld/ringworld_scenes3.h b/engines/tsage/ringworld/ringworld_scenes3.h
index 2f79afe9d5..2dbdc27211 100644
--- a/engines/tsage/ringworld/ringworld_scenes3.h
+++ b/engines/tsage/ringworld/ringworld_scenes3.h
@@ -28,11 +28,11 @@
#include "tsage/converse.h"
#include "tsage/ringworld/ringworld_logic.h"
-namespace tSage {
+namespace TsAGE {
namespace Ringworld {
-using namespace tSage;
+using namespace TsAGE;
class Scene2000 : public Scene {
/* Actions */
@@ -896,6 +896,6 @@ public:
} // End of namespace Ringworld
-} // End of namespace tSage
+} // End of namespace TsAGE
#endif
diff --git a/engines/tsage/ringworld/ringworld_scenes4.cpp b/engines/tsage/ringworld/ringworld_scenes4.cpp
index ff4c5e3bf3..0f4c3e49a0 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 {
namespace Ringworld {
@@ -229,7 +229,7 @@ void Scene3700::Action1::signal() {
/*--------------------------------------------------------------------------*/
-void Scene3700::postInit(tSage::SceneObjectList *OwnerList) {
+void Scene3700::postInit(TsAGE::SceneObjectList *OwnerList) {
Scene::postInit();
loadScene(3700);
@@ -251,4 +251,4 @@ void Scene3700::postInit(tSage::SceneObjectList *OwnerList) {
} // End of namespace Ringworld
-} // End of namespace tSage
+} // End of namespace TsAGE
diff --git a/engines/tsage/ringworld/ringworld_scenes4.h b/engines/tsage/ringworld/ringworld_scenes4.h
index 7b61c21cb0..af31de84b9 100644
--- a/engines/tsage/ringworld/ringworld_scenes4.h
+++ b/engines/tsage/ringworld/ringworld_scenes4.h
@@ -28,11 +28,11 @@
#include "tsage/converse.h"
#include "tsage/ringworld/ringworld_logic.h"
-namespace tSage {
+namespace TsAGE {
namespace Ringworld {
-using namespace tSage;
+using namespace TsAGE;
class Scene3500 : public Scene {
/* Actions */
@@ -93,6 +93,6 @@ public:
} // End of namespace Ringworld
-} // End of namespace tSage
+} // End of namespace TsAGE
#endif
diff --git a/engines/tsage/ringworld/ringworld_scenes5.cpp b/engines/tsage/ringworld/ringworld_scenes5.cpp
index fd3521e14c..58f47d7f82 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 {
namespace Ringworld {
@@ -3522,7 +3522,7 @@ Scene4250::Scene4250() :
_hotspot7(0, CURSOR_LOOK, 4250, 0, LIST_END) {
}
-void Scene4250::postInit(tSage::SceneObjectList *OwnerList) {
+void Scene4250::postInit(TsAGE::SceneObjectList *OwnerList) {
loadScene(4250);
Scene::postInit();
setZoomPercents(160, 90, 185, 100);
@@ -4442,4 +4442,4 @@ void Scene4301::dispatch() {
} // End of namespace Ringworld
-} // End of namespace tSage
+} // End of namespace TsAGE
diff --git a/engines/tsage/ringworld/ringworld_scenes5.h b/engines/tsage/ringworld/ringworld_scenes5.h
index 4ece715345..6c6b6b6f32 100644
--- a/engines/tsage/ringworld/ringworld_scenes5.h
+++ b/engines/tsage/ringworld/ringworld_scenes5.h
@@ -28,11 +28,11 @@
#include "tsage/converse.h"
#include "tsage/ringworld/ringworld_logic.h"
-namespace tSage {
+namespace TsAGE {
namespace Ringworld {
-using namespace tSage;
+using namespace TsAGE;
class Scene4000 : public Scene {
/* Actions */
@@ -693,6 +693,6 @@ public:
} // End of namespace Ringworld
-} // End of namespace tSage
+} // End of namespace TsAGE
#endif
diff --git a/engines/tsage/ringworld/ringworld_scenes6.cpp b/engines/tsage/ringworld/ringworld_scenes6.cpp
index 95e85de1e7..f21ae59478 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 {
namespace Ringworld {
@@ -2200,4 +2200,4 @@ void Scene5300::signal() {
} // End of namespace Ringworld
-} // End of namespace tSage
+} // End of namespace TsAGE
diff --git a/engines/tsage/ringworld/ringworld_scenes6.h b/engines/tsage/ringworld/ringworld_scenes6.h
index 839d73ca69..79e604a177 100644
--- a/engines/tsage/ringworld/ringworld_scenes6.h
+++ b/engines/tsage/ringworld/ringworld_scenes6.h
@@ -30,11 +30,11 @@
#include "tsage/scenes.h"
#include "tsage/globals.h"
-namespace tSage {
+namespace TsAGE {
namespace Ringworld {
-using namespace tSage;
+using namespace TsAGE;
class Scene5000 : public Scene {
/* Actions */
@@ -330,6 +330,6 @@ public:
} // End of namespace Ringworld
-} // End of namespace tSage
+} // End of namespace TsAGE
#endif
diff --git a/engines/tsage/ringworld/ringworld_scenes8.cpp b/engines/tsage/ringworld/ringworld_scenes8.cpp
index 739fbb019e..5f1ff5cdca 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 {
namespace Ringworld {
@@ -2546,4 +2546,4 @@ void Scene7700::synchronize(Serializer &s) {
} // End of namespace Ringworld
-} // End of namespace tSage
+} // End of namespace TsAGE
diff --git a/engines/tsage/ringworld/ringworld_scenes8.h b/engines/tsage/ringworld/ringworld_scenes8.h
index 9b4d23dc2a..4878db5cc8 100644
--- a/engines/tsage/ringworld/ringworld_scenes8.h
+++ b/engines/tsage/ringworld/ringworld_scenes8.h
@@ -30,11 +30,11 @@
#include "tsage/scenes.h"
#include "tsage/globals.h"
-namespace tSage {
+namespace TsAGE {
namespace Ringworld {
-using namespace tSage;
+using namespace TsAGE;
class NamedHotspotMult : public SceneHotspot {
public:
@@ -491,6 +491,6 @@ public:
} // End of namespace Ringworld
-} // End of namespace tSage
+} // End of namespace TsAGE
#endif