aboutsummaryrefslogtreecommitdiff
path: root/engines/glk
diff options
context:
space:
mode:
authorD G Turner2019-11-23 12:57:35 +0000
committerD G Turner2019-11-23 12:57:35 +0000
commita33fdd93ec2c0ba725ed5443a437a2495fa6947e (patch)
tree5842ae3cef3c7c25c7a45f22bd24ab96a1f9e07a /engines/glk
parent84398f85d8cad3ee2805cfdc6f5563aa4c7748d6 (diff)
downloadscummvm-rg350-a33fdd93ec2c0ba725ed5443a437a2495fa6947e.tar.gz
scummvm-rg350-a33fdd93ec2c0ba725ed5443a437a2495fa6947e.tar.bz2
scummvm-rg350-a33fdd93ec2c0ba725ed5443a437a2495fa6947e.zip
GLK: MAGNETIC: Further Fixes for AmigaOS4 Compilation
Diffstat (limited to 'engines/glk')
-rw-r--r--engines/glk/magnetic/emu.cpp1
-rw-r--r--engines/glk/magnetic/glk.cpp11
2 files changed, 9 insertions, 3 deletions
diff --git a/engines/glk/magnetic/emu.cpp b/engines/glk/magnetic/emu.cpp
index 6dd0b11b21..80682d546d 100644
--- a/engines/glk/magnetic/emu.cpp
+++ b/engines/glk/magnetic/emu.cpp
@@ -2102,6 +2102,7 @@ type16 Magnetic::show_hints_text(ms_hint *hintsData, type16 index) {
case -4: /* Show parent hint list */
if (hint->parent != 0xffff)
return 0;
+ // fallthrough
default:
if ((input > 0) && (input <= hint->elcount)) {
if (show_hints_text(hintsData, hint->links[input - 1]) == 1)
diff --git a/engines/glk/magnetic/glk.cpp b/engines/glk/magnetic/glk.cpp
index 1c0a366671..725f5fd4e6 100644
--- a/engines/glk/magnetic/glk.cpp
+++ b/engines/glk/magnetic/glk.cpp
@@ -738,7 +738,7 @@ void Magnetic::gms_graphics_convert_palette(type16 ms_palette[], gms_gammaref_t
void Magnetic::gms_graphics_position_picture(winid_t glk_window,
int pixel_size, type16 width, type16 height, int *x_offset, int *y_offset) {
- glui32 window_width, window_height;
+ uint window_width, window_height;
assert(glk_window && x_offset && y_offset);
/* Measure the current graphics window dimensions. */
@@ -1630,7 +1630,7 @@ void Magnetic::ms_statuschar(type8 c) {
}
void Magnetic::gms_status_update() {
- glui32 width, height;
+ uint width, height;
int index;
assert(gms_status_window);
@@ -2197,8 +2197,13 @@ void Magnetic::gms_hint_arrange_windows(int requested_lines, glui32 *width, glui
winmethod_Above | winmethod_Fixed,
requested_lines, NULL);
+ uint width_temp, height_temp;
+
/* Measure, and return the size of the hint menu window. */
- glk_window_get_size(gms_hint_menu_window, width, height);
+ glk_window_get_size(gms_hint_menu_window, &width_temp, &height_temp);
+
+ *width = width_temp;
+ *height = height_temp;
/* Clear both the hint menu and the hint text window. */
glk_window_clear(gms_hint_menu_window);