aboutsummaryrefslogtreecommitdiff
path: root/engines/glk/glulxe
diff options
context:
space:
mode:
authorPaul Gilbert2019-04-18 08:07:35 -0700
committerPaul Gilbert2019-04-18 08:07:35 -0700
commitbdf5f1596ac4e5a21828272fcf295430bb28babb (patch)
tree6b99c891cea2a7f64da6bab6e04413d97adc5420 /engines/glk/glulxe
parent02e1ef79245e14b291d2993a08aa716a3e5478ae (diff)
downloadscummvm-rg350-bdf5f1596ac4e5a21828272fcf295430bb28babb.tar.gz
scummvm-rg350-bdf5f1596ac4e5a21828272fcf295430bb28babb.tar.bz2
scummvm-rg350-bdf5f1596ac4e5a21828272fcf295430bb28babb.zip
GLK: GLULXE: Fix mismatching typecasts
Diffstat (limited to 'engines/glk/glulxe')
-rw-r--r--engines/glk/glulxe/glulxe.h8
-rw-r--r--engines/glk/glulxe/string.cpp6
2 files changed, 7 insertions, 7 deletions
diff --git a/engines/glk/glulxe/glulxe.h b/engines/glk/glulxe/glulxe.h
index 00d0be8fe9..99e8b1a643 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 12bd61b961..d891a9d49c 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 = '?';