[Scummvm-git-logs] scummvm master -> 62f36d77c88ad8a5111eddfc9b0d072bee306ba8
dreammaster
paulfgilbert at gmail.com
Mon Sep 30 01:39:33 CEST 2019
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
62f36d77c8 GLK: Changing ScummGlk engine name to Glk
Commit: 62f36d77c88ad8a5111eddfc9b0d072bee306ba8
https://github.com/scummvm/scummvm/commit/62f36d77c88ad8a5111eddfc9b0d072bee306ba8
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2019-09-29T16:38:41-07:00
Commit Message:
GLK: Changing ScummGlk engine name to Glk
Calling the engine a different name than it's namespace was just
causing confusion. Better to simply call it Glk, even if it will
be both the underlying API as well as the overall engine name
Changed paths:
engines/glk/detection.h
engines/glk/glk_types.h
engines/glk/tads/os_glk.cpp
engines/glk/tads/os_glk.h
diff --git a/engines/glk/detection.h b/engines/glk/detection.h
index d262e43..2a63c59 100644
--- a/engines/glk/detection.h
+++ b/engines/glk/detection.h
@@ -38,7 +38,7 @@ public:
GlkMetaEngine() : MetaEngine() {}
virtual const char *getName() const {
- return "ScummGlk";
+ return "Glk";
}
virtual const char *getOriginalCopyright() const {
diff --git a/engines/glk/glk_types.h b/engines/glk/glk_types.h
index f99d2b1..d3db3d4 100644
--- a/engines/glk/glk_types.h
+++ b/engines/glk/glk_types.h
@@ -156,7 +156,7 @@ enum WinMethod {
winmethod_Right = 0x01,
winmethod_Above = 0x02,
winmethod_Below = 0x03,
- winmethod_Arbitrary = 0x04, ///< Newly introduced for ScummGlk
+ winmethod_Arbitrary = 0x04, ///< Newly introduced for ScummVM Glk
winmethod_DirMask = 0x0f,
winmethod_Fixed = 0x10,
diff --git a/engines/glk/tads/os_glk.cpp b/engines/glk/tads/os_glk.cpp
index 808eb10..c7cd021 100644
--- a/engines/glk/tads/os_glk.cpp
+++ b/engines/glk/tads/os_glk.cpp
@@ -973,11 +973,11 @@ int os_get_str_rsc(int id, char *buf, size_t buflen) {
}
void os_dbg_printf(const char *fmt, ...) {
- // No implementation, since ScummGlk doesn't yet implement a debugger
+ // No implementation, since we haven't set up a ScummVM debugger
}
void os_dbg_vprintf(const char *fmt, va_list args) {
- // No implementation, since ScummGlk doesn't yet implement a debugger
+ // No implementation, since we haven't set up a ScummVM debugger
}
int os_vasprintf(char **bufptr, const char *fmt, va_list ap) {
diff --git a/engines/glk/tads/os_glk.h b/engines/glk/tads/os_glk.h
index ac5090f..3f82313 100644
--- a/engines/glk/tads/os_glk.h
+++ b/engines/glk/tads/os_glk.h
@@ -35,7 +35,7 @@ namespace Glk {
namespace TADS {
#define TADS_RUNTIME_VERSION "2.5.17"
-#define OS_SYSTEM_NAME "ScummGlk"
+#define OS_SYSTEM_NAME "ScummVM Glk"
#define OSPATHCHAR '/'
#define OSPATHALT ""
More information about the Scummvm-git-logs
mailing list