[Scummvm-git-logs] scummvm master -> 0a6f015a862747df716d310dd98df9a572a9dfbe
dreammaster
paulfgilbert at gmail.com
Sun Jul 7 02:24:48 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:
0a6f015a86 GLK: ALAN3: Fix gcc errors
Commit: 0a6f015a862747df716d310dd98df9a572a9dfbe
https://github.com/scummvm/scummvm/commit/0a6f015a862747df716d310dd98df9a572a9dfbe
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2019-07-06T17:24:37-07:00
Commit Message:
GLK: ALAN3: Fix gcc errors
Changed paths:
engines/glk/alan3/inter.cpp
engines/glk/detection.cpp
engines/glk/detection.h
diff --git a/engines/glk/alan3/inter.cpp b/engines/glk/alan3/inter.cpp
index 5d70b39..471f6a9 100644
--- a/engines/glk/alan3/inter.cpp
+++ b/engines/glk/alan3/inter.cpp
@@ -763,7 +763,7 @@ void interpret(CONTEXT, Aaddr adr) {
case I_SETSIZE: {
Set *set = (Set *)fromAptr(pop(stack));
if (traceInstructionOption)
- printf("SETSIZE\t%7ld\t\t", (long)set);
+ printf("SETSIZE\t%7p\t\t", set);
push(stack, setSize(set));
if (traceInstructionOption)
traceIntegerTopValue();
@@ -773,7 +773,7 @@ void interpret(CONTEXT, Aaddr adr) {
Set *set = (Set *)fromAptr(pop(stack));
Aint index = pop(stack);
if (traceInstructionOption)
- printf("SETMEMB\t%7ld, %7ld", (long)set, (long)index);
+ printf("SETMEMB\t%7p, %7ld", set, (long)index);
push(stack, getSetMember(set, index));
if (traceInstructionOption)
traceIntegerTopValue();
diff --git a/engines/glk/detection.cpp b/engines/glk/detection.cpp
index b19ecde..f7ba0a6 100644
--- a/engines/glk/detection.cpp
+++ b/engines/glk/detection.cpp
@@ -56,21 +56,21 @@
namespace Glk {
-GlkDetectedGame::GlkDetectedGame(const char *gameId, const char *gameDesc, const Common::String &filename) :
- DetectedGame(gameId, gameDesc, Common::EN_ANY, Common::kPlatformUnknown) {
+GlkDetectedGame::GlkDetectedGame(const char *id, const char *desc, const Common::String &filename) :
+ DetectedGame(id, desc, Common::EN_ANY, Common::kPlatformUnknown) {
setGUIOptions(GUIO3(GUIO_NOSPEECH, GUIO_NOMUSIC, GUIO_NOSUBTITLES));
addExtraEntry("filename", filename);
}
-GlkDetectedGame::GlkDetectedGame(const char *gameId, const char *gameDesc, const Common::String &filename,
- Common::Language lang) : DetectedGame(gameId, gameDesc, lang, Common::kPlatformUnknown) {
+GlkDetectedGame::GlkDetectedGame(const char *id, const char *desc, const Common::String &filename,
+ Common::Language lang) : DetectedGame(id, desc, lang, Common::kPlatformUnknown) {
setGUIOptions(GUIO3(GUIO_NOSPEECH, GUIO_NOMUSIC, GUIO_NOSUBTITLES));
addExtraEntry("filename", filename);
}
-GlkDetectedGame::GlkDetectedGame(const char *gameId, const char *gameDesc, const Common::String &filename,
+GlkDetectedGame::GlkDetectedGame(const char *id, const char *desc, const Common::String &filename,
const Common::String &md5, size_t filesize) :
- DetectedGame(gameId, gameDesc, Common::UNK_LANG, Common::kPlatformUnknown) {
+ DetectedGame(id, desc, Common::UNK_LANG, Common::kPlatformUnknown) {
setGUIOptions(GUIO3(GUIO_NOSPEECH, GUIO_NOMUSIC, GUIO_NOSUBTITLES));
addExtraEntry("filename", filename);
diff --git a/engines/glk/detection.h b/engines/glk/detection.h
index 2e2047e..677519d 100644
--- a/engines/glk/detection.h
+++ b/engines/glk/detection.h
@@ -107,10 +107,10 @@ struct GameDescriptor {
*/
class GlkDetectedGame : public DetectedGame {
public:
- GlkDetectedGame(const char *gameId, const char *gameDesc, const Common::String &filename);
- GlkDetectedGame(const char *gameId, const char *gameDesc, const Common::String &filename,
+ GlkDetectedGame(const char *id, const char *desc, const Common::String &filename);
+ GlkDetectedGame(const char *id, const char *desc, const Common::String &filename,
Common::Language lang);
- GlkDetectedGame(const char *gameId, const char *gameDesc, const Common::String &filename,
+ GlkDetectedGame(const char *id, const char *desc, const Common::String &filename,
const Common::String &md5, size_t filesize);
};
More information about the Scummvm-git-logs
mailing list