aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Gilbert2018-12-08 19:45:44 -0800
committerPaul Gilbert2018-12-08 19:45:44 -0800
commit34d01af00482cde23de2913e383c409fd82d96c7 (patch)
tree1e9457346b08ad65a45266820fe54be1c56f9581
parentac9830614d07d80f0c02d9d7c75d709f9d534466 (diff)
downloadscummvm-rg350-34d01af00482cde23de2913e383c409fd82d96c7.tar.gz
scummvm-rg350-34d01af00482cde23de2913e383c409fd82d96c7.tar.bz2
scummvm-rg350-34d01af00482cde23de2913e383c409fd82d96c7.zip
GLK: Fix Buildbot identified warnings
-rw-r--r--engines/glk/frotz/detection.cpp2
-rw-r--r--engines/glk/glk_api.cpp2
-rw-r--r--engines/glk/glulxe/detection.cpp3
-rw-r--r--engines/glk/tads/detection.cpp3
4 files changed, 4 insertions, 6 deletions
diff --git a/engines/glk/frotz/detection.cpp b/engines/glk/frotz/detection.cpp
index 7afeec227f..c0b7149082 100644
--- a/engines/glk/frotz/detection.cpp
+++ b/engines/glk/frotz/detection.cpp
@@ -98,7 +98,7 @@ bool FrotzMetaEngine::detectGames(const Common::FSList &fslist, DetectedGames &g
if (dot)
fname = Common::String(fname.c_str(), dot);
- debug("ENTRY0(\"%s\", \"%s-%s\", \"%s\", %lu),",
+ debug("ENTRY0(\"%s\", \"%s-%s\", \"%s\", %u),",
folderName.c_str(), fname.c_str(), serial, md5.c_str(), filesize);
}
const PlainGameDescriptor &desc = FROTZ_GAME_LIST[0];
diff --git a/engines/glk/glk_api.cpp b/engines/glk/glk_api.cpp
index c24d452a50..08dce8cd12 100644
--- a/engines/glk/glk_api.cpp
+++ b/engines/glk/glk_api.cpp
@@ -1006,7 +1006,7 @@ glui32 GlkAPI::glk_schannel_play(schanid_t chan, glui32 snd) {
glui32 GlkAPI::glk_schannel_play_ext(schanid_t chan, glui32 snd, glui32 repeats, glui32 notify) {
if (chan) {
- chan->play(snd, repeats, notify);
+ return chan->play(snd, repeats, notify);
} else {
warning("schannel_play_ext: invalid ref");
return 0;
diff --git a/engines/glk/glulxe/detection.cpp b/engines/glk/glulxe/detection.cpp
index 0e1ec1f907..9314470a1b 100644
--- a/engines/glk/glulxe/detection.cpp
+++ b/engines/glk/glulxe/detection.cpp
@@ -89,8 +89,7 @@ bool GlulxeMetaEngine::detectGames(const Common::FSList &fslist, DetectedGames &
if (dot)
fname = Common::String(fname.c_str(), dot);
- debug("ENTRY0(\"%s\", \"%s\", %lu),",
- fname.c_str(), md5.c_str(), filesize);
+ debug("ENTRY0(\"%s\", \"%s\", %u),", fname.c_str(), md5.c_str(), filesize);
}
const PlainGameDescriptor &desc = GLULXE_GAME_LIST[0];
gd = DetectedGame(desc.gameId, desc.description, Common::UNK_LANG, Common::kPlatformUnknown);
diff --git a/engines/glk/tads/detection.cpp b/engines/glk/tads/detection.cpp
index 5f0bfea00e..d33cb5d7e1 100644
--- a/engines/glk/tads/detection.cpp
+++ b/engines/glk/tads/detection.cpp
@@ -79,8 +79,7 @@ bool TADSMetaEngine::detectGames(const Common::FSList &fslist, DetectedGames &ga
if (dot)
fname = Common::String(fname.c_str(), dot);
- debug("ENTRY0(\"%s\", \"%s\", %lu),",
- fname.c_str(), md5.c_str(), filesize);
+ debug("ENTRY0(\"%s\", \"%s\", %u),", fname.c_str(), md5.c_str(), filesize);
}
const TADSDescriptor &desc = TADS_GAME_LIST[0];
gd = DetectedGame(desc.gameId, desc.description, Common::UNK_LANG, Common::kPlatformUnknown);