GLK: Fix gcc compiler warnings

8 files changed, 11 insertions, 10 deletions

diff --git a/engines/glk/blorb.cpp b/engines/glk/blorb.cpp
index e298e1ccc3..ed730bfa8a 100644
--- a/engines/glk/blorb.cpp
+++ b/engines/glk/blorb.cpp
@@ -35,7 +35,7 @@ struct giblorb_chunkdesc_struct {
     glui32 startpos;	///< start of chunk header
     glui32 datpos;		///< start of data (either startpos or startpos+8)
 
-    void *ptr;		///< pointer to malloc'd data, if loaded
+    byte *ptr;		///< pointer to malloc'd data, if loaded
     int auxdatnum;	///< entry in the auxsound/auxpict array; -1 if none. This only applies to chunks that represent resources;
 };
 typedef giblorb_chunkdesc_struct giblorb_chunkdesc_t;
@@ -406,7 +406,7 @@ giblorb_err_t Blorb::giblorb_load_chunk_by_number(giblorb_map_t *map,
 		glui32 method, giblorb_result_t *res, glui32 chunknum) {
 	giblorb_chunkdesc_t *chu;
 
-	if (chunknum < 0 || chunknum >= map->numchunks)
+	if (chunknum >= map->numchunks)
 		return giblorb_err_NotFound;
 
 	chu = &(map->chunks[chunknum]);
@@ -451,7 +451,7 @@ giblorb_err_t Blorb::giblorb_load_chunk_by_number(giblorb_map_t *map,
 giblorb_err_t Blorb::giblorb_unload_chunk(giblorb_map_t *map, glui32 chunknum) {
 	giblorb_chunkdesc_t *chu;
 
-	if (chunknum < 0 || chunknum >= map->numchunks)
+	if (chunknum >= map->numchunks)
 		return giblorb_err_NotFound;
 
 	chu = &(map->chunks[chunknum]);
diff --git a/engines/glk/frotz/detection.cpp b/engines/glk/frotz/detection.cpp
index 61d9a1455e..29eb5d7e94 100644
--- a/engines/glk/frotz/detection.cpp
+++ b/engines/glk/frotz/detection.cpp
@@ -93,7 +93,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\", %u),",
+				debug("ENTRY0(\"%s\", \"%s-%s\", \"%s\", %lu),",
 					folderName.c_str(), fname.c_str(), serial, md5.c_str(), filesize);
 			}
 			const PlainGameDescriptor &desc = FROTZ_GAME_LIST[0];
diff --git a/engines/glk/frotz/glk_interface.h b/engines/glk/frotz/glk_interface.h
index c18ebb8c59..0103f88b1b 100644
--- a/engines/glk/frotz/glk_interface.h
+++ b/engines/glk/frotz/glk_interface.h
@@ -174,6 +174,7 @@ public:
 	 * Constructor
 	 */
 	GlkInterface(OSystem *syst, const GlkGameDescription &gameDesc);
+	virtual ~GlkInterface() {}
 
 	/**
 	 * Initialization
diff --git a/engines/glk/frotz/mem.h b/engines/glk/frotz/mem.h
index 43b272720e..372c7e78d1 100644
--- a/engines/glk/frotz/mem.h
+++ b/engines/glk/frotz/mem.h
@@ -128,8 +128,8 @@ public:
 	zbyte h_screen_cols;
 	zword h_screen_width;
 	zword h_screen_height;
-	zbyte h_font_height = 1;
-	zbyte h_font_width = 1;
+	zbyte h_font_height;
+	zbyte h_font_width;
 	zword h_functions_offset;
 	zword h_strings_offset;
 	zbyte h_default_background;
@@ -267,6 +267,7 @@ public:
 	 * Constructor
 	 */
 	Mem();
+	virtual ~Mem() {}
 
 	/**
 	 * Initialize
diff --git a/engines/glk/frotz/processor.h b/engines/glk/frotz/processor.h
index 1a1dfc5fe3..7c8944f451 100644
--- a/engines/glk/frotz/processor.h
+++ b/engines/glk/frotz/processor.h
@@ -1529,6 +1529,7 @@ public:
 	 * Constructor
 	 */
 	Processor(OSystem *syst, const GlkGameDescription &gameDesc);
+	virtual ~Processor() {}
 
 	/**
 	 * Initialization
diff --git a/engines/glk/frotz/processor_screen.cpp b/engines/glk/frotz/processor_screen.cpp
index 6c25ef9a0d..2e07b477cb 100644
--- a/engines/glk/frotz/processor_screen.cpp
+++ b/engines/glk/frotz/processor_screen.cpp
@@ -74,7 +74,7 @@ void Processor::screen_char(zchar c) {
 			cury ++;
 		} else {
 			if (cury == 1) {
-				if (curx <= ((sizeof statusline / sizeof(zchar)) - 1)) {
+				if (curx <= (int)((sizeof statusline / sizeof(zchar)) - 1)) {
 					statusline[curx - 1] = c;
 					statusline[curx] = 0;
 				}
diff --git a/engines/glk/glk_api.h b/engines/glk/glk_api.h
index 8a37df1b7c..400f3c08cd 100644
--- a/engines/glk/glk_api.h
+++ b/engines/glk/glk_api.h
@@ -44,6 +44,7 @@ public:
 	 * Constructor
 	 */
 	GlkAPI(OSystem *syst, const GlkGameDescription &gameDesc);
+	virtual ~GlkAPI() {}
 
 	void glk_exit(void);
 	void glk_set_interrupt_handler(void(*func)(void));
diff --git a/engines/glk/window_graphics.cpp b/engines/glk/window_graphics.cpp
index e80fc8e8a8..f81313e111 100644
--- a/engines/glk/window_graphics.cpp
+++ b/engines/glk/window_graphics.cpp
@@ -40,15 +40,12 @@ GraphicsWindow::~GraphicsWindow() {
 void GraphicsWindow::rearrange(const Rect &box) {
 	int newwid, newhgt;
 	int bothwid, bothhgt;
-	int oldw, oldh;
 	Graphics::ManagedSurface *newSurface;
 
 	_bbox = box;
 
 	newwid = box.width();
 	newhgt = box.height();
-	oldw = _w;
-	oldh = _h;
 
 	if (newwid <= 0 || newhgt <= 0) {
 		_w = 0;