From f2f46395ba8ba2653aefcbc07c90c71d76871386 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Wed, 26 Jun 2019 21:47:57 -0700
Subject: GLK: ALAN3: Further gcc warning fixes

---
 engines/glk/alan3/alt_info.cpp | 4 ++--
 engines/glk/alan3/location.cpp | 2 +-
 engines/glk/alan3/rules.cpp    | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'engines/glk/alan3')

diff --git a/engines/glk/alan3/alt_info.cpp b/engines/glk/alan3/alt_info.cpp
index d9e8bd2004..1b2b3feab5 100644
--- a/engines/glk/alan3/alt_info.cpp
+++ b/engines/glk/alan3/alt_info.cpp
@@ -312,9 +312,9 @@ static AltEntry *findAlternative(Aaddr verbTableAddress, int verbCode, int param
 
 /*----------------------------------------------------------------------*/
 static AltEntry *alternativeFinder(int verb, int parameterNumber, int theInstance, int theClass) {
-	if (theClass != NO_CLASS)
+	if ((Aword)theClass != NO_CLASS)
 		return findAlternative(classes[theClass].verbs, verb, parameterNumber);
-	else if (theInstance != NO_INSTANCE)
+	else if ((Aword)theInstance != NO_INSTANCE)
 		return findAlternative(instances[theInstance].verbs, verb, parameterNumber);
 	else
 		return findAlternative(header->verbTableAddress, verb, parameterNumber);
diff --git a/engines/glk/alan3/location.cpp b/engines/glk/alan3/location.cpp
index 2199b7a653..13076b4937 100644
--- a/engines/glk/alan3/location.cpp
+++ b/engines/glk/alan3/location.cpp
@@ -39,7 +39,7 @@ namespace Glk {
 namespace Alan3 {
 
 /*----------------------------------------------------------------------*/
-static void traceExit(int location, int dir, char *what) {
+static void traceExit(int location, int dir, const char *what) {
 	printf("\n<EXIT %s[%d] from ",
 	       (char *)pointerTo(dictionary[playerWords[currentWordIndex - 1].code].string), dir);
 	traceSay(location);
diff --git a/engines/glk/alan3/rules.cpp b/engines/glk/alan3/rules.cpp
index 53b922061c..de64a8db9a 100644
--- a/engines/glk/alan3/rules.cpp
+++ b/engines/glk/alan3/rules.cpp
@@ -87,7 +87,7 @@ void initRules(Aaddr ruleTableAddress) {
 
 
 /*----------------------------------------------------------------------*/
-static void traceRuleStart(int rule, char *what) {
+static void traceRuleStart(int rule, const char *what) {
 	printf("\n<RULE %d", rule);
 	if (current.location != 0) {
 		printf(" (at ");
-- 
cgit v1.2.3