diff options
Diffstat (limited to 'engines/glk/frotz')
25 files changed, 59 insertions, 59 deletions
diff --git a/engines/glk/frotz/detection.cpp b/engines/glk/frotz/detection.cpp index 57965c8efb..36303d409b 100644 --- a/engines/glk/frotz/detection.cpp +++ b/engines/glk/frotz/detection.cpp @@ -26,7 +26,7 @@ #include "glk/frotz/detection_tables.h" -namespace Gargoyle { +namespace Glk { namespace Frotz { bool FrotzMetaEngine::detectGames(const Common::FSList &fslist, DetectedGames &gameList) { @@ -77,4 +77,4 @@ bool FrotzMetaEngine::detectGames(const Common::FSList &fslist, DetectedGames &g } } // End of namespace Frotz -} // End of namespace Gargoyle +} // End of namespace Glk diff --git a/engines/glk/frotz/detection.h b/engines/glk/frotz/detection.h index 7630cb3f0f..9cd9373b2b 100644 --- a/engines/glk/frotz/detection.h +++ b/engines/glk/frotz/detection.h @@ -26,7 +26,7 @@ #include "common/fs.h" #include "engines/game.h" -namespace Gargoyle { +namespace Glk { namespace Frotz { class FrotzMetaEngine { @@ -38,6 +38,6 @@ public: }; } // End of namespace Frotz -} // End of namespace Gargoyle +} // End of namespace Glk #endif diff --git a/engines/glk/frotz/detection_tables.cpp b/engines/glk/frotz/detection_tables.cpp index 3f619a5e4f..f52b099d75 100644 --- a/engines/glk/frotz/detection_tables.cpp +++ b/engines/glk/frotz/detection_tables.cpp @@ -22,7 +22,7 @@ #include "glk/frotz/detection_tables.h" -namespace Gargoyle { +namespace Glk { namespace Frotz { const char *const AMFV_DESC = "A Mind Forever Voyaging"; @@ -82,4 +82,4 @@ const FrotzGameDescription FROTZ_GAMES[] = { } // End of namespace Frotz -} // End of namespace Gargoyle +} // End of namespace Glk diff --git a/engines/glk/frotz/detection_tables.h b/engines/glk/frotz/detection_tables.h index 48e0eb0a5a..51994ed967 100644 --- a/engines/glk/frotz/detection_tables.h +++ b/engines/glk/frotz/detection_tables.h @@ -23,7 +23,7 @@ #include "engines/advancedDetector.h" #include "common/language.h" -namespace Gargoyle { +namespace Glk { namespace Frotz { /** @@ -82,4 +82,4 @@ extern const char *const ZORK3_DESC; extern const char *const ZTUU_DESC; } // End of namespace Frotz -} // End of namespace Gargoyle +} // End of namespace Glk diff --git a/engines/glk/frotz/frotz.cpp b/engines/glk/frotz/frotz.cpp index 0e516f0496..f30acd0a4b 100644 --- a/engines/glk/frotz/frotz.cpp +++ b/engines/glk/frotz/frotz.cpp @@ -24,12 +24,12 @@ #include "glk/frotz/frotz_types.h" #include "common/config-manager.h" -namespace Gargoyle { +namespace Glk { namespace Frotz { Frotz *g_vm; -Frotz::Frotz(OSystem *syst, const GargoyleGameDescription *gameDesc) : +Frotz::Frotz(OSystem *syst, const GlkGameDescription *gameDesc) : Processor(syst, gameDesc) { g_vm = this; } @@ -95,4 +95,4 @@ Common::Error Frotz::saveGameState(int slot, const Common::String &desc) { } } // End of namespace Scott -} // End of namespace Gargoyle +} // End of namespace Glk diff --git a/engines/glk/frotz/frotz.h b/engines/glk/frotz/frotz.h index c1fe5dcab6..cecd88637a 100644 --- a/engines/glk/frotz/frotz.h +++ b/engines/glk/frotz/frotz.h @@ -25,7 +25,7 @@ #include "glk/frotz/processor.h" -namespace Gargoyle { +namespace Glk { namespace Frotz { /** @@ -36,7 +36,7 @@ public: /** * Constructor */ - Frotz(OSystem *syst, const GargoyleGameDescription *gameDesc); + Frotz(OSystem *syst, const GlkGameDescription *gameDesc); /** * Destructor @@ -67,6 +67,6 @@ public: extern Frotz *g_vm; } // End of namespace Frotz -} // End of namespace Gargoyle +} // End of namespace Glk #endif diff --git a/engines/glk/frotz/frotz_types.h b/engines/glk/frotz/frotz_types.h index 5aae3d07c3..e68f55e147 100644 --- a/engines/glk/frotz/frotz_types.h +++ b/engines/glk/frotz/frotz_types.h @@ -26,7 +26,7 @@ #include "glk/glk_types.h" #include "common/algorithm.h" -namespace Gargoyle { +namespace Glk { namespace Frotz { #define MAX_UNDO_SLOTS 500 @@ -292,6 +292,6 @@ struct Redirect { }; } // End of namespace Frotz -} // End of namespace Gargoyle +} // End of namespace Glk #endif diff --git a/engines/glk/frotz/glk_interface.cpp b/engines/glk/frotz/glk_interface.cpp index b2534385e4..da27382c04 100644 --- a/engines/glk/frotz/glk_interface.cpp +++ b/engines/glk/frotz/glk_interface.cpp @@ -22,11 +22,11 @@ #include "glk/frotz/glk_interface.h" -namespace Gargoyle { +namespace Glk { namespace Frotz { -GlkInterface::GlkInterface(OSystem *syst, const GargoyleGameDescription *gameDesc) : - Glk(syst, gameDesc), +GlkInterface::GlkInterface(OSystem *syst, const GlkGameDescription *gameDesc) : + GlkAPI(syst, gameDesc), oldstyle(0), curstyle(0), cury(1), curx(1), fixforced(0), curr_fg(-2), curr_bg(-2), curr_font(1), prev_font(1), temp_font(0), curr_status_ht(0), mach_status_ht(0), gos_status(nullptr), gos_upper(nullptr), @@ -495,4 +495,4 @@ zchar GlkInterface::os_read_line(int max, zchar *buf, int timeout, int width, in } } // End of namespace Scott -} // End of namespace Gargoyle +} // End of namespace Glk diff --git a/engines/glk/frotz/glk_interface.h b/engines/glk/frotz/glk_interface.h index e3fa2c9081..d78d49ffbb 100644 --- a/engines/glk/frotz/glk_interface.h +++ b/engines/glk/frotz/glk_interface.h @@ -23,10 +23,10 @@ #ifndef GLK_FROTZ_GLK_INTERFACE #define GLK_FROTZ_GLK_INTERFACE -#include "glk/glk.h" +#include "glk/glk_api.h" #include "glk/frotz/mem.h" -namespace Gargoyle { +namespace Glk { namespace Frotz { enum SoundEffect { @@ -47,7 +47,7 @@ enum RestartAction { * Implements an intermediate interface on top of the GLK layer, providing screen * and sound effect handling */ -class GlkInterface : public Glk, public virtual UserOptions, public virtual Mem { +class GlkInterface : public GlkAPI, public virtual UserOptions, public virtual Mem { public: zchar statusline[256]; int oldstyle; @@ -181,7 +181,7 @@ public: /** * Constructor */ - GlkInterface(OSystem *syst, const GargoyleGameDescription *gameDesc); + GlkInterface(OSystem *syst, const GlkGameDescription *gameDesc); /** * Initialization @@ -190,6 +190,6 @@ public: }; } // End of namespace Frotz -} // End of namespace Gargoyle +} // End of namespace Glk #endif diff --git a/engines/glk/frotz/mem.cpp b/engines/glk/frotz/mem.cpp index a7747f5698..378e49666d 100644 --- a/engines/glk/frotz/mem.cpp +++ b/engines/glk/frotz/mem.cpp @@ -25,7 +25,7 @@ #include "common/memstream.h" #include "common/textconsole.h" -namespace Gargoyle { +namespace Glk { namespace Frotz { const Header::StoryEntry Header::RECORDS[25] = { @@ -416,4 +416,4 @@ void Mem::mem_undiff(zbyte *diff, long diff_length, zbyte *dest) { } } // End of namespace Scott -} // End of namespace Gargoyle +} // End of namespace Glk diff --git a/engines/glk/frotz/mem.h b/engines/glk/frotz/mem.h index de22006a33..43b272720e 100644 --- a/engines/glk/frotz/mem.h +++ b/engines/glk/frotz/mem.h @@ -25,7 +25,7 @@ #include "glk/frotz/frotz_types.h" -namespace Gargoyle { +namespace Glk { namespace Frotz { #define SET_WORD(addr,v) zmp[addr] = hi(v); zmp[addr+1] = lo(v) @@ -275,6 +275,6 @@ public: }; } // End of namespace Frotz -} // End of namespace Gargoyle +} // End of namespace Glk #endif diff --git a/engines/glk/frotz/processor.cpp b/engines/glk/frotz/processor.cpp index 1cdc67a589..a7cbad0427 100644 --- a/engines/glk/frotz/processor.cpp +++ b/engines/glk/frotz/processor.cpp @@ -23,7 +23,7 @@ #include "glk/frotz/processor.h" #include "glk/frotz/frotz.h" -namespace Gargoyle { +namespace Glk { namespace Frotz { // TODO: Stubs to replace with actual code @@ -131,7 +131,7 @@ Opcode Processor::ext_opcodes[64] = { &Processor::z_buffer_screen, // spec 1.1 }; -Processor::Processor(OSystem *syst, const GargoyleGameDescription *gameDesc) : +Processor::Processor(OSystem *syst, const GlkGameDescription *gameDesc) : GlkInterface(syst, gameDesc), _finished(0), _sp(nullptr), _fp(nullptr), _frameCount(0), zargc(0), _decoded(nullptr), _encoded(nullptr), _resolution(0), @@ -661,4 +661,4 @@ void Processor::z_restore_undo(void) { } } // End of namespace Scott -} // End of namespace Gargoyle +} // End of namespace Glk diff --git a/engines/glk/frotz/processor.h b/engines/glk/frotz/processor.h index b5c113def0..4bd9d2c5af 100644 --- a/engines/glk/frotz/processor.h +++ b/engines/glk/frotz/processor.h @@ -28,7 +28,7 @@ #include "glk/frotz/frotz_types.h" #include "common/stack.h" -namespace Gargoyle { +namespace Glk { namespace Frotz { #define TEXT_BUFFER_SIZE 200 @@ -1522,7 +1522,7 @@ public: /** * Constructor */ - Processor(OSystem *syst, const GargoyleGameDescription *gameDesc); + Processor(OSystem *syst, const GlkGameDescription *gameDesc); /** * Initialization @@ -1579,6 +1579,6 @@ public: }; } // End of namespace Frotz -} // End of namespace Gargoyle +} // End of namespace Glk #endif diff --git a/engines/glk/frotz/processor_buffer.cpp b/engines/glk/frotz/processor_buffer.cpp index faec6ef33d..c4eaeaa42e 100644 --- a/engines/glk/frotz/processor_buffer.cpp +++ b/engines/glk/frotz/processor_buffer.cpp @@ -24,7 +24,7 @@ #include "common/algorithm.h" #include "common/textconsole.h" -namespace Gargoyle { +namespace Glk { namespace Frotz { const char *const Processor::ERR_MESSAGES[ERR_NUM_ERRORS] = { @@ -189,4 +189,4 @@ void Processor::runtimeError(ErrorCode errNum) { } } // End of namespace Scott -} // End of namespace Gargoyle +} // End of namespace Glk diff --git a/engines/glk/frotz/processor_input.cpp b/engines/glk/frotz/processor_input.cpp index 6dda853fa0..af5c7dc42c 100644 --- a/engines/glk/frotz/processor_input.cpp +++ b/engines/glk/frotz/processor_input.cpp @@ -22,7 +22,7 @@ #include "glk/frotz/processor.h" -namespace Gargoyle { +namespace Glk { namespace Frotz { #define INPUT_BUFFER_SIZE 200 @@ -220,4 +220,4 @@ void Processor::z_read_mouse(){ } } // End of namespace Scott -} // End of namespace Gargoyle +} // End of namespace Glk diff --git a/engines/glk/frotz/processor_maths.cpp b/engines/glk/frotz/processor_maths.cpp index 90e09ca8b9..5a2a522cc2 100644 --- a/engines/glk/frotz/processor_maths.cpp +++ b/engines/glk/frotz/processor_maths.cpp @@ -22,7 +22,7 @@ #include "glk/frotz/processor.h" -namespace Gargoyle { +namespace Glk { namespace Frotz { void Processor::z_add() { @@ -102,4 +102,4 @@ void Processor::z_test() { } } // End of namespace Scott -} // End of namespace Gargoyle +} // End of namespace Glk diff --git a/engines/glk/frotz/processor_mem.cpp b/engines/glk/frotz/processor_mem.cpp index 7c7af0d2f5..dec7520084 100644 --- a/engines/glk/frotz/processor_mem.cpp +++ b/engines/glk/frotz/processor_mem.cpp @@ -22,7 +22,7 @@ #include "glk/frotz/processor.h" -namespace Gargoyle { +namespace Glk { namespace Frotz { void Processor::flagsChanged(zbyte value) { @@ -215,4 +215,4 @@ void Processor::memory_close(void) { } } // End of namespace Scott -} // End of namespace Gargoyle +} // End of namespace Glk diff --git a/engines/glk/frotz/processor_objects.cpp b/engines/glk/frotz/processor_objects.cpp index 7e1fe6de0c..13e8a11518 100644 --- a/engines/glk/frotz/processor_objects.cpp +++ b/engines/glk/frotz/processor_objects.cpp @@ -22,7 +22,7 @@ #include "glk/frotz/processor.h" -namespace Gargoyle { +namespace Glk { namespace Frotz { #define MAX_OBJECT 2000 @@ -729,4 +729,4 @@ void Processor::z_test_attr() { } } // End of namespace Scott -} // End of namespace Gargoyle +} // End of namespace Glk diff --git a/engines/glk/frotz/processor_screen.cpp b/engines/glk/frotz/processor_screen.cpp index 87c190f3c5..6c25ef9a0d 100644 --- a/engines/glk/frotz/processor_screen.cpp +++ b/engines/glk/frotz/processor_screen.cpp @@ -22,7 +22,7 @@ #include "glk/frotz/processor.h" -namespace Gargoyle { +namespace Glk { namespace Frotz { void Processor::screen_mssg_on() { @@ -525,4 +525,4 @@ void Processor::z_split_window() { } } // End of namespace Scott -} // End of namespace Gargoyle +} // End of namespace Glk diff --git a/engines/glk/frotz/processor_streams.cpp b/engines/glk/frotz/processor_streams.cpp index b7b23b2db9..8413f4bb6e 100644 --- a/engines/glk/frotz/processor_streams.cpp +++ b/engines/glk/frotz/processor_streams.cpp @@ -23,7 +23,7 @@ #include "glk/frotz/processor.h" #include "glk/frotz/quetzal.h" -namespace Gargoyle { +namespace Glk { namespace Frotz { zchar Processor::console_read_input(int max, zchar *buf, zword timeout, bool continued) { @@ -783,4 +783,4 @@ void Processor::z_verify() { } } // End of namespace Scott -} // End of namespace Gargoyle +} // End of namespace Glk diff --git a/engines/glk/frotz/processor_table.cpp b/engines/glk/frotz/processor_table.cpp index bb163899af..c586355038 100644 --- a/engines/glk/frotz/processor_table.cpp +++ b/engines/glk/frotz/processor_table.cpp @@ -22,7 +22,7 @@ #include "glk/frotz/processor.h" -namespace Gargoyle { +namespace Glk { namespace Frotz { void Processor::z_copy_table() { @@ -117,4 +117,4 @@ void Processor::z_storew() { } } // End of namespace Scott -} // End of namespace Gargoyle +} // End of namespace Glk diff --git a/engines/glk/frotz/processor_text.cpp b/engines/glk/frotz/processor_text.cpp index e05879398e..3cfe50b44a 100644 --- a/engines/glk/frotz/processor_text.cpp +++ b/engines/glk/frotz/processor_text.cpp @@ -22,7 +22,7 @@ #include "glk/frotz/processor.h" -namespace Gargoyle { +namespace Glk { namespace Frotz { zchar Processor::ZSCII_TO_LATIN1[] = { @@ -883,4 +883,4 @@ void Processor::z_tokenise() { } } // End of namespace Scott -} // End of namespace Gargoyle +} // End of namespace Glk diff --git a/engines/glk/frotz/processor_variables.cpp b/engines/glk/frotz/processor_variables.cpp index 0162f84d17..6e6a19191e 100644 --- a/engines/glk/frotz/processor_variables.cpp +++ b/engines/glk/frotz/processor_variables.cpp @@ -22,7 +22,7 @@ #include "glk/frotz/processor.h" -namespace Gargoyle { +namespace Glk { namespace Frotz { void Processor::z_dec() { @@ -196,4 +196,4 @@ void Processor::z_store() { } } // End of namespace Scott -} // End of namespace Gargoyle +} // End of namespace Glk diff --git a/engines/glk/frotz/quetzal.cpp b/engines/glk/frotz/quetzal.cpp index a7b48fc699..9ff33ab8ae 100644 --- a/engines/glk/frotz/quetzal.cpp +++ b/engines/glk/frotz/quetzal.cpp @@ -24,7 +24,7 @@ #include "glk/frotz/processor.h" #include "common/memstream.h" -namespace Gargoyle { +namespace Glk { namespace Frotz { /** @@ -482,4 +482,4 @@ int Quetzal::restore(Common::SeekableReadStream *svf, Processor *proc) { } } // End of namespace Scott -} // End of namespace Gargoyle +} // End of namespace Glk diff --git a/engines/glk/frotz/quetzal.h b/engines/glk/frotz/quetzal.h index bbd4496a45..9d382abaf0 100644 --- a/engines/glk/frotz/quetzal.h +++ b/engines/glk/frotz/quetzal.h @@ -26,7 +26,7 @@ #include "glk/glk_types.h" #include "glk/frotz/frotz_types.h" -namespace Gargoyle { +namespace Glk { namespace Frotz { enum QueztalTag { @@ -92,6 +92,6 @@ public: }; } // End of namespace Frotz -} // End of namespace Gargoyle +} // End of namespace Glk #endif |