From 697230709be6b9460b4a3ac9bc8d9c7f065562d2 Mon Sep 17 00:00:00 2001 From: Paul Gilbert Date: Mon, 15 Aug 2011 20:47:59 +1000 Subject: TSAGE: Corrected casing of tSage namespace to be TsAGE This matches the casing of the original engine name. --- engines/tsage/blue_force/blueforce_logic.cpp | 10 ++++++---- engines/tsage/blue_force/blueforce_logic.h | 8 +++++--- engines/tsage/blue_force/blueforce_scenes0.cpp | 4 ++-- engines/tsage/blue_force/blueforce_scenes0.h | 6 +++--- engines/tsage/blue_force/blueforce_scenes1.cpp | 10 +++++----- engines/tsage/blue_force/blueforce_scenes1.h | 8 ++++---- engines/tsage/converse.cpp | 4 ++-- engines/tsage/converse.h | 4 ++-- engines/tsage/core.cpp | 4 ++-- engines/tsage/core.h | 6 +++--- engines/tsage/debugger.cpp | 4 ++-- engines/tsage/debugger.h | 4 ++-- engines/tsage/detection.cpp | 16 ++++++++-------- engines/tsage/detection_tables.h | 4 ++-- engines/tsage/dialogs.cpp | 4 ++-- engines/tsage/dialogs.h | 4 ++-- engines/tsage/events.cpp | 4 ++-- engines/tsage/events.h | 4 ++-- engines/tsage/globals.cpp | 4 ++-- engines/tsage/globals.h | 6 +++--- engines/tsage/graphics.cpp | 4 ++-- engines/tsage/graphics.h | 4 ++-- engines/tsage/resources.cpp | 4 ++-- engines/tsage/resources.h | 4 ++-- engines/tsage/ringworld/ringworld_demo.cpp | 4 ++-- engines/tsage/ringworld/ringworld_demo.h | 6 +++--- engines/tsage/ringworld/ringworld_logic.cpp | 4 ++-- engines/tsage/ringworld/ringworld_logic.h | 8 ++++---- engines/tsage/ringworld/ringworld_scenes1.cpp | 4 ++-- engines/tsage/ringworld/ringworld_scenes1.h | 6 +++--- engines/tsage/ringworld/ringworld_scenes10.cpp | 4 ++-- engines/tsage/ringworld/ringworld_scenes10.h | 6 +++--- engines/tsage/ringworld/ringworld_scenes2.cpp | 4 ++-- engines/tsage/ringworld/ringworld_scenes2.h | 6 +++--- engines/tsage/ringworld/ringworld_scenes3.cpp | 4 ++-- engines/tsage/ringworld/ringworld_scenes3.h | 6 +++--- engines/tsage/ringworld/ringworld_scenes4.cpp | 6 +++--- engines/tsage/ringworld/ringworld_scenes4.h | 6 +++--- engines/tsage/ringworld/ringworld_scenes5.cpp | 6 +++--- engines/tsage/ringworld/ringworld_scenes5.h | 6 +++--- engines/tsage/ringworld/ringworld_scenes6.cpp | 4 ++-- engines/tsage/ringworld/ringworld_scenes6.h | 6 +++--- engines/tsage/ringworld/ringworld_scenes8.cpp | 4 ++-- engines/tsage/ringworld/ringworld_scenes8.h | 6 +++--- engines/tsage/saveload.cpp | 4 ++-- engines/tsage/saveload.h | 4 ++-- engines/tsage/scenes.cpp | 4 ++-- engines/tsage/scenes.h | 4 ++-- engines/tsage/sound.cpp | 4 ++-- engines/tsage/sound.h | 4 ++-- engines/tsage/staticres.cpp | 4 ++-- engines/tsage/staticres.h | 4 ++-- engines/tsage/tsage.cpp | 4 ++-- engines/tsage/tsage.h | 4 ++-- 54 files changed, 142 insertions(+), 138 deletions(-) diff --git a/engines/tsage/blue_force/blueforce_logic.cpp b/engines/tsage/blue_force/blueforce_logic.cpp index a29d677fb1..0238475533 100644 --- a/engines/tsage/blue_force/blueforce_logic.cpp +++ b/engines/tsage/blue_force/blueforce_logic.cpp @@ -27,13 +27,13 @@ #include "tsage/tsage.h" #include "tsage/staticres.h" -namespace tSage { +namespace TsAGE { namespace BlueForce { void BlueForceGame::start() { // Start the game - _globals->_sceneManager.changeScene(109); + _globals->_sceneManager.changeScene(100); _globals->_events.setCursor(CURSOR_WALK); } @@ -217,7 +217,9 @@ void SceneExt::dispatch() { void SceneExt::loadScene(int sceneNum) { Scene::loadScene(sceneNum); - warning("TODO: word_51C38/word_51C3C"); + + _v51C34.top = 0; + _v51C34.bottom = 300; } /*--------------------------------------------------------------------------*/ @@ -250,4 +252,4 @@ void GameScene::remove() { } // End of namespace BlueForce -} // End of namespace tSage +} // End of namespace TsAGE diff --git a/engines/tsage/blue_force/blueforce_logic.h b/engines/tsage/blue_force/blueforce_logic.h index e870fa1430..1ff6ecf507 100644 --- a/engines/tsage/blue_force/blueforce_logic.h +++ b/engines/tsage/blue_force/blueforce_logic.h @@ -31,11 +31,11 @@ #define BF_INTERFACE_Y 168 -namespace tSage { +namespace TsAGE { namespace BlueForce { -using namespace tSage; +using namespace TsAGE; class BlueForceGame: public Game { public: @@ -64,6 +64,8 @@ public: int _field372; int _field37A; EventHandler *_field37C; + + Rect _v51C34; public: SceneExt(); @@ -92,6 +94,6 @@ public: } // End of namespace BlueForce -} // End of namespace tSage +} // End of namespace TsAGE #endif diff --git a/engines/tsage/blue_force/blueforce_scenes0.cpp b/engines/tsage/blue_force/blueforce_scenes0.cpp index a47d7d712f..cc0f9bb1fd 100644 --- a/engines/tsage/blue_force/blueforce_scenes0.cpp +++ b/engines/tsage/blue_force/blueforce_scenes0.cpp @@ -25,7 +25,7 @@ #include "tsage/tsage.h" #include "tsage/staticres.h" -namespace tSage { +namespace TsAGE { namespace BlueForce { @@ -241,4 +241,4 @@ void Scene50::Tooltip2::dispatch() { } // End of namespace BlueForce -} // End of namespace tSage +} // End of namespace TsAGE diff --git a/engines/tsage/blue_force/blueforce_scenes0.h b/engines/tsage/blue_force/blueforce_scenes0.h index 7eda443ee9..587941e59e 100644 --- a/engines/tsage/blue_force/blueforce_scenes0.h +++ b/engines/tsage/blue_force/blueforce_scenes0.h @@ -32,11 +32,11 @@ #include "tsage/globals.h" #include "tsage/sound.h" -namespace tSage { +namespace TsAGE { namespace BlueForce { -using namespace tSage; +using namespace TsAGE; class Scene20 : public SceneExt { /* Actions */ @@ -82,6 +82,6 @@ public: } // End of namespace BlueForce -} // End of namespace tSage +} // End of namespace TsAGE #endif diff --git a/engines/tsage/blue_force/blueforce_scenes1.cpp b/engines/tsage/blue_force/blueforce_scenes1.cpp index 1dafff2bce..e5d66bcbb5 100644 --- a/engines/tsage/blue_force/blueforce_scenes1.cpp +++ b/engines/tsage/blue_force/blueforce_scenes1.cpp @@ -27,7 +27,7 @@ #include "tsage/staticres.h" #include "tsage/globals.h" -namespace tSage { +namespace TsAGE { namespace BlueForce { @@ -149,7 +149,7 @@ void Scene100::Action2::signal() { /*--------------------------------------------------------------------------*/ -Scene100::Scene100(): Scene() { +Scene100::Scene100(): SceneExt() { _index = 0; } @@ -168,12 +168,12 @@ void Scene100::postInit(SceneObjectList *OwnerList) { // Title loadScene(100); BF_GLOBALS._sound1.play(2); - setAction(&_action2, this); +// setAction(&_action2, this); } else { // Credits loadScene(101); BF_GLOBALS._sound1.play(118); - setAction(&_action1, this); +// setAction(&_action1, this); } loadScene(20); @@ -420,4 +420,4 @@ void Scene109::signal() { } // End of namespace BlueForce -} // End of namespace tSage +} // End of namespace TsAGE diff --git a/engines/tsage/blue_force/blueforce_scenes1.h b/engines/tsage/blue_force/blueforce_scenes1.h index 86ca4a9f14..d6cde0a44d 100644 --- a/engines/tsage/blue_force/blueforce_scenes1.h +++ b/engines/tsage/blue_force/blueforce_scenes1.h @@ -32,13 +32,13 @@ #include "tsage/globals.h" #include "tsage/sound.h" -namespace tSage { +namespace TsAGE { namespace BlueForce { -using namespace tSage; +using namespace TsAGE; -class Scene100: public Scene { +class Scene100: public SceneExt { /* Actions */ class Action1: public ActionExt { private: @@ -119,6 +119,6 @@ public: } // End of namespace BlueForce -} // End of namespace tSage +} // End of namespace TsAGE #endif diff --git a/engines/tsage/converse.cpp b/engines/tsage/converse.cpp index cc1c596ddc..615b1c36fd 100644 --- a/engines/tsage/converse.cpp +++ b/engines/tsage/converse.cpp @@ -26,7 +26,7 @@ #include "tsage/globals.h" #include "tsage/staticres.h" -namespace tSage { +namespace TsAGE { #define STRIP_WORD_DELAY 30 @@ -985,4 +985,4 @@ void AnimatedSpeaker::removeText() { _objectList.draw(); } -} // end of namespace tSage +} // end of namespace TsAGE diff --git a/engines/tsage/converse.h b/engines/tsage/converse.h index 5836b0bfbb..e263a12d12 100644 --- a/engines/tsage/converse.h +++ b/engines/tsage/converse.h @@ -27,7 +27,7 @@ #include "tsage/dialogs.h" #include "tsage/sound.h" -namespace tSage { +namespace TsAGE { class StripCallback : public Action { public: @@ -224,6 +224,6 @@ public: void addSpeaker(Speaker *speaker); }; -} // End of namespace tSage +} // End of namespace TsAGE #endif diff --git a/engines/tsage/core.cpp b/engines/tsage/core.cpp index 492ecf7cb1..864c3af103 100644 --- a/engines/tsage/core.cpp +++ b/engines/tsage/core.cpp @@ -33,7 +33,7 @@ #include "tsage/globals.h" #include "tsage/sound.h" -namespace tSage { +namespace TsAGE { // The engine uses ScumMVM screen buffering, so all logic is hardcoded to use pane buffer 0 #define CURRENT_PANENUM 0 @@ -3620,4 +3620,4 @@ void SceneHandler::dispatchObject(EventHandler *obj) { void SceneHandler::saveListener(Serializer &ser) { } -} // End of namespace tSage +} // End of namespace TsAGE diff --git a/engines/tsage/core.h b/engines/tsage/core.h index c4408e38a4..96e7e82fe5 100644 --- a/engines/tsage/core.h +++ b/engines/tsage/core.h @@ -34,7 +34,7 @@ #include "tsage/resources.h" #include "tsage/saveload.h" -namespace tSage { +namespace TsAGE { #define MAX_FLAGS 256 @@ -714,7 +714,7 @@ public: SynchronizedList::iterator begin() { return _objList.begin(); } SynchronizedList::iterator end() { return _objList.end(); } int size() const { return _objList.size(); } - bool contains(SceneObject *sceneObj) { return tSage::contains(_objList, sceneObj); } + bool contains(SceneObject *sceneObj) { return TsAGE::contains(_objList, sceneObj); } void push_back(SceneObject *sceneObj) { _objList.push_back(sceneObj); } void push_front(SceneObject *sceneObj) { _objList.push_front(sceneObj); } void remove(SceneObject *sceneObj) { @@ -859,6 +859,6 @@ public: static void saveListener(Serializer &ser); }; -} // End of namespace tSage +} // End of namespace TsAGE #endif diff --git a/engines/tsage/debugger.cpp b/engines/tsage/debugger.cpp index cae9639565..e3c4569dd2 100644 --- a/engines/tsage/debugger.cpp +++ b/engines/tsage/debugger.cpp @@ -25,7 +25,7 @@ #include "tsage/graphics.h" #include "tsage/ringworld/ringworld_logic.h" -namespace tSage { +namespace TsAGE { Debugger::Debugger() : GUI::Debugger() { DCmd_Register("continue", WRAP_METHOD(Debugger, Cmd_Exit)); @@ -449,4 +449,4 @@ bool Debugger::Cmd_Sound(int argc, const char **argv) { return false; } -} // End of namespace tSage +} // End of namespace TsAGE diff --git a/engines/tsage/debugger.h b/engines/tsage/debugger.h index 44fd61ec5e..8bc1b06336 100644 --- a/engines/tsage/debugger.h +++ b/engines/tsage/debugger.h @@ -26,7 +26,7 @@ #include "common/scummsys.h" #include "gui/debugger.h" -namespace tSage { +namespace TsAGE { class Debugger : public GUI::Debugger { public: @@ -46,6 +46,6 @@ protected: bool Cmd_Sound(int argc, const char **argv); }; -} // End of namespace tSage +} // End of namespace TsAGE #endif diff --git a/engines/tsage/detection.cpp b/engines/tsage/detection.cpp index c8aa415914..f12efc02e8 100644 --- a/engines/tsage/detection.cpp +++ b/engines/tsage/detection.cpp @@ -30,7 +30,7 @@ #include "tsage/tsage.h" -namespace tSage { +namespace TsAGE { struct tSageGameDescription { ADGameDescription desc; @@ -55,7 +55,7 @@ Common::String TSageEngine::getPrimaryFilename() const { return Common::String(_gameDescription->desc.filesDescriptions[0].fileName); } -} // End of namespace tSage +} // End of namespace TsAGE static const PlainGameDescriptor tSageGameTitles[] = { { "tsage", "Unknown Tsunami TSAGE-based Game" }, @@ -72,7 +72,7 @@ enum { class TSageMetaEngine : public AdvancedMetaEngine { public: - TSageMetaEngine() : AdvancedMetaEngine(tSage::gameDescriptions, sizeof(tSage::tSageGameDescription), tSageGameTitles) { + TSageMetaEngine() : AdvancedMetaEngine(TsAGE::gameDescriptions, sizeof(TsAGE::tSageGameDescription), tSageGameTitles) { _md5Bytes = 5000; _singleid = "tsage"; _guioptions = Common::GUIO_NOSPEECH; @@ -103,7 +103,7 @@ public: virtual bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const { if (desc) { - *engine = new tSage::TSageEngine(syst, (const tSage::tSageGameDescription *)desc); + *engine = new TsAGE::TSageEngine(syst, (const TsAGE::tSageGameDescription *)desc); } return desc != 0; } @@ -118,7 +118,7 @@ public: Common::StringArray filenames = g_system->getSavefileManager()->listSavefiles(pattern); sort(filenames.begin(), filenames.end()); - tSage::tSageSavegameHeader header; + TsAGE::tSageSavegameHeader header; SaveStateList saveList; for (Common::StringArray::const_iterator file = filenames.begin(); file != filenames.end(); ++file) { @@ -129,7 +129,7 @@ public: Common::InSaveFile *in = g_system->getSavefileManager()->openForLoading(*file); if (in) { - if (tSage::Saver::readSavegameHeader(in, header)) { + if (TsAGE::Saver::readSavegameHeader(in, header)) { saveList.push_back(SaveStateDescriptor(slot, header.saveName)); delete header.thumbnail; } @@ -156,8 +156,8 @@ public: generateGameStateFileName(target, slot)); assert(f); - tSage::tSageSavegameHeader header; - tSage::Saver::readSavegameHeader(f, header); + TsAGE::tSageSavegameHeader header; + TsAGE::Saver::readSavegameHeader(f, header); delete f; // Create the return descriptor diff --git a/engines/tsage/detection_tables.h b/engines/tsage/detection_tables.h index fcab028c6d..4b69549673 100644 --- a/engines/tsage/detection_tables.h +++ b/engines/tsage/detection_tables.h @@ -20,7 +20,7 @@ * */ -namespace tSage { +namespace TsAGE { static const tSageGameDescription gameDescriptions[] = { @@ -143,4 +143,4 @@ static const tSageGameDescription gameDescriptions[] = { { AD_TABLE_END_MARKER, 0, 0 } }; -} // End of namespace tSage +} // End of namespace TsAGE diff --git a/engines/tsage/dialogs.cpp b/engines/tsage/dialogs.cpp index 8a1b7c6429..ae385b8c15 100644 --- a/engines/tsage/dialogs.cpp +++ b/engines/tsage/dialogs.cpp @@ -32,7 +32,7 @@ #include "tsage/globals.h" #include "tsage/ringworld/ringworld_logic.h" -namespace tSage { +namespace TsAGE { /*--------------------------------------------------------------------------*/ @@ -595,4 +595,4 @@ OptionsDialog::OptionsDialog() { } -} // End of namespace tSage +} // End of namespace TsAGE diff --git a/engines/tsage/dialogs.h b/engines/tsage/dialogs.h index a50307f775..55adb6c813 100644 --- a/engines/tsage/dialogs.h +++ b/engines/tsage/dialogs.h @@ -30,7 +30,7 @@ #include "common/rect.h" #include "common/system.h" -namespace tSage { +namespace TsAGE { class MessageDialog : public GfxDialog { public: @@ -128,6 +128,6 @@ public: static void show(); }; -} // End of namespace tSage +} // End of namespace TsAGE #endif diff --git a/engines/tsage/events.cpp b/engines/tsage/events.cpp index 59894f3300..44c79bd2fe 100644 --- a/engines/tsage/events.cpp +++ b/engines/tsage/events.cpp @@ -31,7 +31,7 @@ #include "tsage/tsage.h" #include "tsage/globals.h" -namespace tSage { +namespace TsAGE { EventsClass::EventsClass() { _currentCursor = CURSOR_NONE; @@ -325,4 +325,4 @@ void EventsClass::loadNotifierProc(bool postFlag) { } } -} // end of namespace tSage +} // end of namespace TsAGE diff --git a/engines/tsage/events.h b/engines/tsage/events.h index 772de24b5a..c36db59270 100644 --- a/engines/tsage/events.h +++ b/engines/tsage/events.h @@ -29,7 +29,7 @@ #include "graphics/surface.h" #include "tsage/saveload.h" -namespace tSage { +namespace TsAGE { enum EventType {EVENT_NONE = 0, EVENT_BUTTON_DOWN = 1, EVENT_BUTTON_UP = 2, EVENT_KEYPRESS = 4, EVENT_MOUSE_MOVE = 8}; @@ -103,6 +103,6 @@ public: static void loadNotifierProc(bool postFlag); }; -} // End of namespace tSage +} // End of namespace TsAGE #endif diff --git a/engines/tsage/globals.cpp b/engines/tsage/globals.cpp index 5481c79be5..ce37004206 100644 --- a/engines/tsage/globals.cpp +++ b/engines/tsage/globals.cpp @@ -26,7 +26,7 @@ #include "tsage/ringworld/ringworld_demo.h" #include "tsage/ringworld/ringworld_logic.h" -namespace tSage { +namespace TsAGE { Globals *_globals = NULL; ResourceManager *_resourceManager = NULL; @@ -184,4 +184,4 @@ void BlueForceGlobals::synchronize(Serializer &s) { } // end of namespace BlueForce -} // end of namespace tSage +} // end of namespace TsAGE diff --git a/engines/tsage/globals.h b/engines/tsage/globals.h index 40865fba43..b581294883 100644 --- a/engines/tsage/globals.h +++ b/engines/tsage/globals.h @@ -31,7 +31,7 @@ #include "tsage/sound.h" #include "tsage/saveload.h" -namespace tSage { +namespace TsAGE { class Globals : public SavedObject { private: @@ -108,7 +108,7 @@ extern ResourceManager *_resourceManager; namespace BlueForce { -using namespace tSage; +using namespace TsAGE; class BlueForceGlobals: public Globals { public: @@ -128,6 +128,6 @@ public: } // End of namespace BlueForce -} // End of namespace tSage +} // End of namespace TsAGE #endif diff --git a/engines/tsage/graphics.cpp b/engines/tsage/graphics.cpp index 87ffdf4494..7e0994696e 100644 --- a/engines/tsage/graphics.cpp +++ b/engines/tsage/graphics.cpp @@ -30,7 +30,7 @@ #include "graphics/surface.h" #include "tsage/globals.h" -namespace tSage { +namespace TsAGE { /** * Creates a new graphics surface with the specified area of another surface @@ -1512,4 +1512,4 @@ GfxFontBackup::~GfxFontBackup() { } -} // End of namespace tSage +} // End of namespace TsAGE diff --git a/engines/tsage/graphics.h b/engines/tsage/graphics.h index e09e1093a3..45b53612e5 100644 --- a/engines/tsage/graphics.h +++ b/engines/tsage/graphics.h @@ -30,7 +30,7 @@ #include "common/system.h" #include "graphics/surface.h" -namespace tSage { +namespace TsAGE { class GfxSurface; class Region; @@ -343,6 +343,6 @@ GfxSurface *Surface_getArea(GfxSurface &src, const Rect &bounds); GfxSurface surfaceFromRes(const byte *imgData); GfxSurface surfaceFromRes(int resNum, int rlbNum, int subNum); -} // End of namespace tSage +} // End of namespace TsAGE #endif diff --git a/engines/tsage/resources.cpp b/engines/tsage/resources.cpp index 6d2c6b5837..99b431b5dc 100644 --- a/engines/tsage/resources.cpp +++ b/engines/tsage/resources.cpp @@ -28,7 +28,7 @@ #include "tsage/resources.h" #include "tsage/tsage.h" -namespace tSage { +namespace TsAGE { MemoryManager::MemoryManager() { @@ -504,4 +504,4 @@ Common::String ResourceManager::getMessage(int resNum, int lineNum, bool suppres return result; } -} // end of namespace tSage +} // end of namespace TsAGE diff --git a/engines/tsage/resources.h b/engines/tsage/resources.h index efbb86b24e..176d60fcc4 100644 --- a/engines/tsage/resources.h +++ b/engines/tsage/resources.h @@ -33,7 +33,7 @@ #include "common/util.h" #include "graphics/surface.h" -namespace tSage { +namespace TsAGE { // Magic number used by original game to identify valid memory blocks const uint32 MEMORY_ENTRY_ID = 0xE11DA722; @@ -175,6 +175,6 @@ public: }; -} // end of namespace tSage +} // end of namespace TsAGE #endif 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 diff --git a/engines/tsage/saveload.cpp b/engines/tsage/saveload.cpp index e07964d443..45e655037d 100644 --- a/engines/tsage/saveload.cpp +++ b/engines/tsage/saveload.cpp @@ -30,7 +30,7 @@ #include "tsage/sound.h" #include "tsage/tsage.h" -namespace tSage { +namespace TsAGE { Saver *_saver; @@ -410,4 +410,4 @@ void Saver::resolveLoadPointers() { error("Could not resolve savegame block pointers"); } -} // End of namespace tSage +} // End of namespace TsAGE diff --git a/engines/tsage/saveload.h b/engines/tsage/saveload.h index ce181cbc8f..03beafed7c 100644 --- a/engines/tsage/saveload.h +++ b/engines/tsage/saveload.h @@ -29,7 +29,7 @@ #include "common/savefile.h" #include "common/serializer.h" -namespace tSage { +namespace TsAGE { typedef void (*SaveNotifierFn)(bool postFlag); @@ -222,6 +222,6 @@ public: extern Saver *_saver; -} // End of namespace tSage +} // End of namespace TsAGE #endif diff --git a/engines/tsage/scenes.cpp b/engines/tsage/scenes.cpp index 8db1a321f4..181a927c13 100644 --- a/engines/tsage/scenes.cpp +++ b/engines/tsage/scenes.cpp @@ -26,7 +26,7 @@ #include "tsage/tsage.h" #include "tsage/saveload.h" -namespace tSage { +namespace TsAGE { SceneManager::SceneManager() { _scene = NULL; @@ -519,4 +519,4 @@ void Game::execute() { } while (activeFlag && !_vm->shouldQuit()); } -} // End of namespace tSage +} // End of namespace TsAGE diff --git a/engines/tsage/scenes.h b/engines/tsage/scenes.h index 5845efaec9..7e8c26f912 100644 --- a/engines/tsage/scenes.h +++ b/engines/tsage/scenes.h @@ -29,7 +29,7 @@ #include "tsage/core.h" #include "tsage/saveload.h" -namespace tSage { +namespace TsAGE { class Scene : public StripCallback { private: @@ -134,6 +134,6 @@ public: virtual void processEvent(Event &event) {} }; -} // End of namespace tSage +} // End of namespace TsAGE #endif diff --git a/engines/tsage/sound.cpp b/engines/tsage/sound.cpp index efffa70574..22aff6cb04 100644 --- a/engines/tsage/sound.cpp +++ b/engines/tsage/sound.cpp @@ -28,7 +28,7 @@ #include "tsage/graphics.h" #include "tsage/tsage.h" -namespace tSage { +namespace TsAGE { static SoundManager *_soundManager = NULL; @@ -2929,4 +2929,4 @@ void SoundBlasterDriver::proc42(int channel, int cmd, int value, int *v1, int *v *v1 = 1; } -} // End of namespace tSage +} // End of namespace TsAGE diff --git a/engines/tsage/sound.h b/engines/tsage/sound.h index 2c9221c27a..9507d22cfb 100644 --- a/engines/tsage/sound.h +++ b/engines/tsage/sound.h @@ -33,7 +33,7 @@ #include "tsage/saveload.h" #include "tsage/core.h" -namespace tSage { +namespace TsAGE { class Sound; @@ -499,6 +499,6 @@ public: }; -} // End of namespace tSage +} // End of namespace TsAGE #endif diff --git a/engines/tsage/staticres.cpp b/engines/tsage/staticres.cpp index adc69f2fe5..62a22cbe82 100644 --- a/engines/tsage/staticres.cpp +++ b/engines/tsage/staticres.cpp @@ -22,7 +22,7 @@ #include "tsage/staticres.h" -namespace tSage { +namespace TsAGE { const byte CURSOR_ARROW_DATA[] = { 15, 0, 15, 0, 0, 0, 0, 0, 9, 0, @@ -138,4 +138,4 @@ const char *BF_ACADEMY = "Here we are at the Academy"; } // End of namespace BlueForce -} // End of namespace tSage +} // End of namespace TsAGE diff --git a/engines/tsage/staticres.h b/engines/tsage/staticres.h index 1d1fc8b95c..702e767aaf 100644 --- a/engines/tsage/staticres.h +++ b/engines/tsage/staticres.h @@ -25,7 +25,7 @@ #include "common/scummsys.h" -namespace tSage { +namespace TsAGE { extern const byte CURSOR_ARROW_DATA[]; @@ -105,6 +105,6 @@ extern const char *BF_ACADEMY; } // End of namespace BlueForce -} // End of namespace tSage +} // End of namespace TsAGE #endif diff --git a/engines/tsage/tsage.cpp b/engines/tsage/tsage.cpp index 554a5499e5..b958933c0c 100644 --- a/engines/tsage/tsage.cpp +++ b/engines/tsage/tsage.cpp @@ -30,7 +30,7 @@ #include "tsage/resources.h" #include "tsage/globals.h" -namespace tSage { +namespace TsAGE { TSageEngine *_vm = NULL; @@ -155,4 +155,4 @@ bool TSageEngine::shouldQuit() { return getEventManager()->shouldQuit() || getEventManager()->shouldRTL(); } -} // End of namespace tSage +} // End of namespace TsAGE diff --git a/engines/tsage/tsage.h b/engines/tsage/tsage.h index 805461886a..88175f92ce 100644 --- a/engines/tsage/tsage.h +++ b/engines/tsage/tsage.h @@ -36,7 +36,7 @@ #include "tsage/resources.h" -namespace tSage { +namespace TsAGE { enum { GType_Ringworld = 0, @@ -99,6 +99,6 @@ extern TSageEngine *_vm; #define ALLOCATE(x) _vm->_memoryManager.allocate2(x) #define DEALLOCATE(x) _vm->_memoryManager.deallocate(x) -} // End of namespace tSage +} // End of namespace TsAGE #endif -- cgit v1.2.3