[Scummvm-git-logs] scummvm master -> bdf5f1596ac4e5a21828272fcf295430bb28babb

[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:
bdf5f1596a GLK: GLULXE: Fix mismatching typecasts


Commit: bdf5f1596ac4e5a21828272fcf295430bb28babb
    https://github.com/scummvm/scummvm/commit/bdf5f1596ac4e5a21828272fcf295430bb28babb
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2019-04-18T08:07:35-07:00

Commit Message:
GLK: GLULXE: Fix mismatching typecasts

Changed paths:
    engines/glk/glulxe/glulxe.h
    engines/glk/glulxe/string.cpp


diff --git a/engines/glk/glulxe/glulxe.h b/engines/glk/glulxe/glulxe.h
index 00d0be8..99e8b1a 100644
--- a/engines/glk/glulxe/glulxe.h
+++ b/engines/glk/glulxe/glulxe.h
@@ -33,7 +33,7 @@ namespace Glulxe {
 
 class Glulxe;
 typedef void (Glulxe::*CharHandler)(unsigned char);
-typedef void (Glulxe::*UnicharHandler)(uint);
+typedef void (Glulxe::*UnicharHandler)(uint32);
 
 /**
  * Glulxe game interpreter
@@ -381,9 +381,9 @@ protected:
 
 	void nopio_char_han(unsigned char ch);
 	void filio_char_han(unsigned char ch);
-	void nopio_unichar_han(uint ch);
-	void filio_unichar_han(uint ch);
-	void glkio_unichar_nouni_han(uint val);
+	void nopio_unichar_han(uint32 ch);
+	void filio_unichar_han(uint32 ch);
+	void glkio_unichar_nouni_han(uint32 val);
 
 	void dropcache(cacheblock_t *cablist);
 	void buildcache(cacheblock_t *cablist, uint nodeaddr, int depth, int mask);
diff --git a/engines/glk/glulxe/string.cpp b/engines/glk/glulxe/string.cpp
index 12bd61b..d891a9d 100644
--- a/engines/glk/glulxe/string.cpp
+++ b/engines/glk/glulxe/string.cpp
@@ -75,7 +75,7 @@ void Glulxe::stream_set_iosys(uint mode, uint rock) {
 void Glulxe::nopio_char_han(unsigned char ch) {
 }
 
-void Glulxe::nopio_unichar_han(uint ch) {
+void Glulxe::nopio_unichar_han(uint32 ch) {
 }
 
 void Glulxe::filio_char_han(unsigned char ch) {
@@ -84,12 +84,12 @@ void Glulxe::filio_char_han(unsigned char ch) {
 	enter_function(iosys_rock, 1, &val);
 }
 
-void Glulxe::filio_unichar_han(uint val) {
+void Glulxe::filio_unichar_han(uint32 val) {
 	push_callstub(0, 0);
 	enter_function(iosys_rock, 1, &val);
 }
 
-void Glulxe::glkio_unichar_nouni_han(uint val) {
+void Glulxe::glkio_unichar_nouni_han(uint32 val) {
 	/* Only used if the Glk library has no Unicode functions */
 	if (val > 0xFF)
 		val = '?';