[Scummvm-git-logs] scummvm master -> 1156aca3e5961e1ec5f4de3dd0bb221d0dc2f994

[dreammaster]

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:
1156aca3e5 GLK: Fix compiler warnings


Commit: 1156aca3e5961e1ec5f4de3dd0bb221d0dc2f994
    https://github.com/scummvm/scummvm/commit/1156aca3e5961e1ec5f4de3dd0bb221d0dc2f994
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2018-12-09T08:49:20-08:00

Commit Message:
GLK: Fix compiler warnings

Changed paths:
    engines/glk/frotz/detection.cpp
    engines/glk/frotz/processor_screen.cpp
    engines/glk/glulxe/detection.cpp
    engines/glk/tads/detection.cpp


diff --git a/engines/glk/frotz/detection.cpp b/engines/glk/frotz/detection.cpp
index c0b7149..1d3e1ce 100644
--- a/engines/glk/frotz/detection.cpp
+++ b/engines/glk/frotz/detection.cpp
@@ -99,7 +99,7 @@ bool FrotzMetaEngine::detectGames(const Common::FSList &fslist, DetectedGames &g
 					fname = Common::String(fname.c_str(), dot);
 
 				debug("ENTRY0(\"%s\", \"%s-%s\", \"%s\", %u),",
-					folderName.c_str(), fname.c_str(), serial, md5.c_str(), filesize);
+					folderName.c_str(), fname.c_str(), serial, md5.c_str(), (uint)filesize);
 			}
 			const PlainGameDescriptor &desc = FROTZ_GAME_LIST[0];
 			gd = DetectedGame(desc.gameId, desc.description, Common::UNK_LANG, Common::kPlatformUnknown);
diff --git a/engines/glk/frotz/processor_screen.cpp b/engines/glk/frotz/processor_screen.cpp
index 3adec66..5e2a331 100644
--- a/engines/glk/frotz/processor_screen.cpp
+++ b/engines/glk/frotz/processor_screen.cpp
@@ -258,9 +258,6 @@ void Processor::z_set_colour() {
 
 	switch (zfore) {
 	case -1:
-		zfore = -3;
-		break;
-
 	case 0:
 	case 1:
 		zfore = zcolor_map[zfore];
@@ -274,8 +271,6 @@ void Processor::z_set_colour() {
 
 	switch (zback) {
 	case -1:
-		zback = -3;
-
 	case 0:
 	case 1:
 		zback = zcolor_map[zback];
@@ -287,9 +282,7 @@ void Processor::z_set_colour() {
 		break;
 	}
 
-#ifdef GARGLK
 	garglk_set_zcolors(zfore, zback);
-#endif /* GARGLK */
 
 	curr_fg = zfore;
 	curr_bg = zback;
diff --git a/engines/glk/glulxe/detection.cpp b/engines/glk/glulxe/detection.cpp
index 9314470..c2e19de 100644
--- a/engines/glk/glulxe/detection.cpp
+++ b/engines/glk/glulxe/detection.cpp
@@ -89,7 +89,7 @@ bool GlulxeMetaEngine::detectGames(const Common::FSList &fslist, DetectedGames &
 				if (dot)
 					fname = Common::String(fname.c_str(), dot);
 
-				debug("ENTRY0(\"%s\", \"%s\", %u),", fname.c_str(), md5.c_str(), filesize);
+				debug("ENTRY0(\"%s\", \"%s\", %u),", fname.c_str(), md5.c_str(), (uint)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 d33cb5d..df7eee1 100644
--- a/engines/glk/tads/detection.cpp
+++ b/engines/glk/tads/detection.cpp
@@ -79,7 +79,7 @@ bool TADSMetaEngine::detectGames(const Common::FSList &fslist, DetectedGames &ga
 				if (dot)
 					fname = Common::String(fname.c_str(), dot);
 
-				debug("ENTRY0(\"%s\", \"%s\", %u),", fname.c_str(), md5.c_str(), filesize);
+				debug("ENTRY0(\"%s\", \"%s\", %u),", fname.c_str(), md5.c_str(), (uint)filesize);
 			}
 			const TADSDescriptor &desc = TADS_GAME_LIST[0];
 			gd = DetectedGame(desc.gameId, desc.description, Common::UNK_LANG, Common::kPlatformUnknown);