[Scummvm-git-logs] scummvm master -> 9f6e1a8f293b1b525c79437e002d7848bc952ce4

[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:
9f6e1a8f29 GLK: HUGO: Compilation fixes


Commit: 9f6e1a8f293b1b525c79437e002d7848bc952ce4
    https://github.com/scummvm/scummvm/commit/9f6e1a8f293b1b525c79437e002d7848bc952ce4
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2019-05-12T10:38:03+10:00

Commit Message:
GLK: HUGO: Compilation fixes

Changed paths:
    engines/glk/hugo/hemedia.cpp
    engines/glk/hugo/heparse.cpp
    engines/glk/hugo/hugo.h
    engines/glk/hugo/stringfn.cpp
    engines/glk/hugo/stringfn.h


diff --git a/engines/glk/hugo/hemedia.cpp b/engines/glk/hugo/hemedia.cpp
index 19c9874..a7ddbf6 100644
--- a/engines/glk/hugo/hemedia.cpp
+++ b/engines/glk/hugo/hemedia.cpp
@@ -63,7 +63,7 @@ int Hugo::loadres(HUGO_FILE infile, int reslen, int type) {
 
 	while (reslen > 0)
 	{
-		n = hugo_fread(buf, 1, reslen < sizeof buf ? reslen : sizeof buf, infile);
+		n = hugo_fread(buf, 1, reslen < (int)sizeof(buf) ? reslen : sizeof(buf), infile);
 		if (n <= 0)
 			break;
 		glk_put_buffer_stream(stream, buf, n);
diff --git a/engines/glk/hugo/heparse.cpp b/engines/glk/hugo/heparse.cpp
index da01810..c837b46 100644
--- a/engines/glk/hugo/heparse.cpp
+++ b/engines/glk/hugo/heparse.cpp
@@ -284,7 +284,7 @@ int Hugo::DomainObj(int obj) {
 	return yes;
 }
 
-unsigned int Hugo::FindWord(char *a) {
+unsigned int Hugo::FindWord(const char *a) {
 	unsigned int ptr = 0;
 	int i, p, alen;
 
diff --git a/engines/glk/hugo/hugo.h b/engines/glk/hugo/hugo.h
index 8d2d18b..e49e313 100644
--- a/engines/glk/hugo/hugo.h
+++ b/engines/glk/hugo/hugo.h
@@ -197,7 +197,7 @@ private:
 	int extra_param;
 	char loaded_filename[MAX_RES_PATH];
 	char loaded_resname[MAX_RES_PATH];
-	char resource_type = 0;
+	char resource_type;
 
 	// herun
 	int passlocal[MAXLOCALS];		///< locals passed to routine
@@ -760,7 +760,7 @@ private:
 	/**
 	 * Returns the dictionary address of <a>.
 	 */
-	unsigned int FindWord(char *a);
+	unsigned int FindWord(const char *a);
 
 	/**
 	 * Checks to see if <obj> is in objlist[].
diff --git a/engines/glk/hugo/stringfn.cpp b/engines/glk/hugo/stringfn.cpp
index 4e94b3e..0b194cf 100644
--- a/engines/glk/hugo/stringfn.cpp
+++ b/engines/glk/hugo/stringfn.cpp
@@ -112,5 +112,11 @@ char *StringFunctions::strlwr(char *s) {
 	return s;
 }
 
+char *StringFunctions::strupr(char *s) {
+	for (char *sp = s; *sp; ++sp)
+		*sp = toupper(*sp);
+	return s;
+}
+
 } // End of namespace Hugo
 } // End of namespace Glk
diff --git a/engines/glk/hugo/stringfn.h b/engines/glk/hugo/stringfn.h
index 2ee6e3e..f5f29b1 100644
--- a/engines/glk/hugo/stringfn.h
+++ b/engines/glk/hugo/stringfn.h
@@ -58,6 +58,8 @@ public:
 	char *hugo_strcpy(char *s, const char *t);
 
 	char *strlwr(char *s);
+
+	char *strupr(char *s);
 };