diff options
| -rw-r--r-- | engines/glk/adrift/adrift.cpp | 4 | ||||
| -rw-r--r-- | engines/glk/adrift/os_glk.cpp | 8 | ||||
| -rw-r--r-- | engines/glk/adrift/os_glk.h | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/engines/glk/adrift/adrift.cpp b/engines/glk/adrift/adrift.cpp index 8ae56df56d..9ba4e1c230 100644 --- a/engines/glk/adrift/adrift.cpp +++ b/engines/glk/adrift/adrift.cpp @@ -33,8 +33,8 @@ Adrift::Adrift(OSystem *syst, const GlkGameDescription &gameDesc) : GlkAPI(syst, } void Adrift::runGame() { - if (winglk_startup_code(&_gameFile)) - glk_main(); + if (adrift_startup_code(&_gameFile)) + adrift_main(); } Common::Error Adrift::readSaveData(Common::SeekableReadStream *rs) { diff --git a/engines/glk/adrift/os_glk.cpp b/engines/glk/adrift/os_glk.cpp index 1244b48e1c..33253802a2 100644 --- a/engines/glk/adrift/os_glk.cpp +++ b/engines/glk/adrift/os_glk.cpp @@ -3302,12 +3302,12 @@ static int gsc_startup_called = FALSE, gsc_main_called = FALSE; /* - * glk_main() + * adrift_main() * * Main entry point for Glk. Here, all startup is done, and we call our * function to run the game, or to report errors if gsc_game_message is set. */ -void glk_main() { +void adrift_main() { assert(gsc_startup_called && !gsc_main_called); gsc_main_called = TRUE; @@ -3320,7 +3320,7 @@ void glk_main() { /* Glk linkage relevant only to the UNIX platform */ /*---------------------------------------------------------------------*/ -#ifdef TODO +#ifdef UNUSED /* * Glk arguments for UNIX versions of the Glk interpreter. */ @@ -3348,7 +3348,7 @@ glkunix_argumentlist_t glkunix_arguments[] = { * * Startup entry point for Windows versions of Glk interpreter. */ -bool winglk_startup_code(Common::SeekableReadStream *gameFile) { +bool adrift_startup_code(Common::SeekableReadStream *gameFile) { const char *locale; sc_uint trace_flags; sc_bool enable_debugger, stable_random; diff --git a/engines/glk/adrift/os_glk.h b/engines/glk/adrift/os_glk.h index 0bc26812d8..52c7d8948b 100644 --- a/engines/glk/adrift/os_glk.h +++ b/engines/glk/adrift/os_glk.h @@ -29,8 +29,8 @@ namespace Glk { namespace Adrift { -extern bool winglk_startup_code(Common::SeekableReadStream *gameFile); -extern void glk_main(); +extern bool adrift_startup_code(Common::SeekableReadStream *gameFile); +extern void adrift_main(); } // End of namespace Adrift } // End of namespace Glk |