From 1156aca3e5961e1ec5f4de3dd0bb221d0dc2f994 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 9 Dec 2018 08:49:20 -0800
Subject: GLK: Fix compiler warnings

---
 engines/glk/frotz/detection.cpp        | 2 +-
 engines/glk/frotz/processor_screen.cpp | 7 -------
 engines/glk/glulxe/detection.cpp       | 2 +-
 engines/glk/tads/detection.cpp         | 2 +-
 4 files changed, 3 insertions(+), 10 deletions(-)

(limited to 'engines')

diff --git a/engines/glk/frotz/detection.cpp b/engines/glk/frotz/detection.cpp
index c0b7149082..1d3e1ce412 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 3adec6612d..5e2a3318db 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 9314470a1b..c2e19de4e9 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 d33cb5d7e1..df7eee1585 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);
-- 
cgit v1.2.3