diff options
| author | Paul Gilbert | 2018-11-13 20:05:59 -0800 |
|---|---|---|
| committer | Paul Gilbert | 2018-12-08 19:05:59 -0800 |
| commit | a2104deb4cefdcf0cd6bb3a66ef09bb46cba3f66 (patch) | |
| tree | 802a8abed7a2f97aa9fa0d7f467054a9e0ab79b8 /engines/glk/scott | |
| parent | 1fb931fbd950324754536ee0b33ed0b91f68c9a2 (diff) | |
| download | scummvm-rg350-a2104deb4cefdcf0cd6bb3a66ef09bb46cba3f66.tar.gz scummvm-rg350-a2104deb4cefdcf0cd6bb3a66ef09bb46cba3f66.tar.bz2 scummvm-rg350-a2104deb4cefdcf0cd6bb3a66ef09bb46cba3f66.zip | |
GLK: Changing class and namespaces from Gargoyle to Glk
Diffstat (limited to 'engines/glk/scott')
| -rw-r--r-- | engines/glk/scott/detection.cpp | 4 | ||||
| -rw-r--r-- | engines/glk/scott/detection.h | 4 | ||||
| -rw-r--r-- | engines/glk/scott/scott.cpp | 6 | ||||
| -rw-r--r-- | engines/glk/scott/scott.h | 10 |
4 files changed, 12 insertions, 12 deletions
diff --git a/engines/glk/scott/detection.cpp b/engines/glk/scott/detection.cpp index 900f6507fc..7afdf93bba 100644 --- a/engines/glk/scott/detection.cpp +++ b/engines/glk/scott/detection.cpp @@ -24,7 +24,7 @@ #include "common/file.h" #include "common/md5.h" -namespace Gargoyle { +namespace Glk { namespace Scott { struct ScottGame { @@ -106,4 +106,4 @@ bool ScottMetaEngine::detectGames(const Common::FSList &fslist, DetectedGames &g } } // End of namespace Scott -} // End of namespace Gargoyle +} // End of namespace Glk diff --git a/engines/glk/scott/detection.h b/engines/glk/scott/detection.h index cd487bdfdd..2c187cdc4a 100644 --- a/engines/glk/scott/detection.h +++ b/engines/glk/scott/detection.h @@ -26,7 +26,7 @@ #include "common/fs.h" #include "engines/game.h" -namespace Gargoyle { +namespace Glk { namespace Scott { class ScottMetaEngine { @@ -38,6 +38,6 @@ public: }; } // End of namespace Scott -} // End of namespace Gargoyle +} // End of namespace Glk #endif diff --git a/engines/glk/scott/scott.cpp b/engines/glk/scott/scott.cpp index a5e866796a..2def1a2a74 100644 --- a/engines/glk/scott/scott.cpp +++ b/engines/glk/scott/scott.cpp @@ -23,10 +23,10 @@ #include "glk/scott/scott.h" #include "common/config-manager.h" -namespace Gargoyle { +namespace Glk { namespace Scott { -Scott::Scott(OSystem *syst, const GargoyleGameDescription *gameDesc) : Glk(syst, gameDesc), +Scott::Scott(OSystem *syst, const GlkGameDescription *gameDesc) : GlkAPI(syst, gameDesc), Items(nullptr), Rooms(nullptr), Verbs(nullptr), Nouns(nullptr), Messages(nullptr), Actions(nullptr), CurrentCounter(0), SavedRoom(0), Options(0), Width(0), TopHeight(0), split_screen(true), Bottom(0), Top(0), BitFlags(0), _saveSlot(-1) { @@ -1260,4 +1260,4 @@ void Scott::readInts(Common::SeekableReadStream *f, size_t count, ...) { } } // End of namespace Scott -} // End of namespace Gargoyle +} // End of namespace Glk diff --git a/engines/glk/scott/scott.h b/engines/glk/scott/scott.h index ec6a8601ba..68994855fb 100644 --- a/engines/glk/scott/scott.h +++ b/engines/glk/scott/scott.h @@ -28,9 +28,9 @@ */ #include "common/scummsys.h" -#include "glk/glk.h" +#include "glk/glk_api.h" -namespace Gargoyle { +namespace Glk { namespace Scott { #define LIGHT_SOURCE 9 // Always 9 how odd @@ -109,7 +109,7 @@ struct Tail { /** * Scott Adams game interpreter */ -class Scott : public Glk { +class Scott : public GlkAPI { private: Header GameHeader; Item *Items; @@ -167,7 +167,7 @@ public: /** * Constructor */ - Scott(OSystem *syst, const GargoyleGameDescription *gameDesc); + Scott(OSystem *syst, const GlkGameDescription *gameDesc); /** * Execute the game @@ -186,6 +186,6 @@ public: }; } // End of namespace Scott -} // End of namespace Gargoyle +} // End of namespace Glk #endif |