From: borg323 <4010067-borg323@users.noreply.gitlab.com> Date: Sun, 7 Jul 2019 11:16:04 +0000 (+0300) Subject: change os_check_unicode() 2nd argument to zchar X-Git-Url: https://scope-eye.net/git/?a=commitdiff_plain;h=7ef0790a58b183857b5a07f237dae63d18e53266;p=liskon_frotz.git change os_check_unicode() 2nd argument to zchar --- diff --git a/src/common/frotz.h b/src/common/frotz.h index e09480a..9f4513f 100644 --- a/src/common/frotz.h +++ b/src/common/frotz.h @@ -807,7 +807,7 @@ Zwindow * curwinrec( void); void os_beep (int); int os_char_width (zchar); -int os_check_unicode (int, zword); +int os_check_unicode (int, zchar); void os_display_char (zchar); void os_display_string (const zchar *); void os_draw_picture (int, int, int); diff --git a/src/curses/ux_text.c b/src/curses/ux_text.c index 3a04ea7..f0fb425 100644 --- a/src/curses/ux_text.c +++ b/src/curses/ux_text.c @@ -284,7 +284,7 @@ void os_display_string (const zchar *s) * displayed, and bit 1 if it can be input. * */ -int os_check_unicode(int font, zword c) +int os_check_unicode(int font, zchar c) { /* Assume full input and output. */ return 3; diff --git a/src/dumb/dumb_output.c b/src/dumb/dumb_output.c index 0e4f78f..9d716bd 100644 --- a/src/dumb/dumb_output.c +++ b/src/dumb/dumb_output.c @@ -90,7 +90,7 @@ static char *dumb_changes_row(int r) return screen_changes + r * h_screen_cols; } -int os_check_unicode(int font, zword c) +int os_check_unicode(int font, zchar c) { /* Only UTF-8 output, no input yet. */ return 1; diff --git a/src/sdl/sf_fonts.c b/src/sdl/sf_fonts.c index 63f8504..7444392 100644 --- a/src/sdl/sf_fonts.c +++ b/src/sdl/sf_fonts.c @@ -434,7 +434,7 @@ void sf_poptextsettings() * * */ -int os_check_unicode(int font, zword c) +int os_check_unicode(int font, zchar c) { return ((current.font->hasglyph(current.font,c,0) != 0) ? 3 : 2); }