From dccd75113bf995708bae70bfcec9dba6a192e30e Mon Sep 17 00:00:00 2001 From: kichikuou Date: Sun, 2 Feb 2025 14:04:49 +0900 Subject: [PATCH] emscripten: Make load_mincho_font() return bool --- modules/lib/drawtext.c | 2 +- src/cmdz.c | 2 +- src/font.c | 4 ++-- src/font.h | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/lib/drawtext.c b/modules/lib/drawtext.c index 99770dd..d8e8d6d 100644 --- a/modules/lib/drawtext.c +++ b/modules/lib/drawtext.c @@ -45,7 +45,7 @@ static int fsize; // フォントの大きさ int dt_setfont(int type, int size) { #ifdef __EMSCRIPTEN__ if (type == FONT_MINCHO) { - if (load_mincho_font() != OK) + if (!load_mincho_font()) type = FONT_GOTHIC; } #endif diff --git a/src/cmdz.c b/src/cmdz.c index 08685c6..4e0cc3f 100644 --- a/src/cmdz.c +++ b/src/cmdz.c @@ -468,7 +468,7 @@ void commandZZ13() { int num = getCaliValue(); #ifdef __EMSCRIPTEN__ if (num == FONT_MINCHO) { - if (load_mincho_font() != OK) + if (!load_mincho_font()) num = FONT_GOTHIC; } #endif diff --git a/src/font.c b/src/font.c index c2bd65c..297e60a 100644 --- a/src/font.c +++ b/src/font.c @@ -235,7 +235,7 @@ bool font_get_antialias(void) { } #ifdef __EMSCRIPTEN__ -EM_ASYNC_JS(int, load_mincho_font, (void), { - await xsystem35.load_mincho_font(); +EM_ASYNC_JS(bool, load_mincho_font, (void), { + return await xsystem35.load_mincho_font(); }); #endif diff --git a/src/font.h b/src/font.h index 87877cb..bb5d3ee 100644 --- a/src/font.h +++ b/src/font.h @@ -43,7 +43,7 @@ extern struct SDL_Surface *font_get_glyph(const char *str_utf8); extern SDL_Rect font_draw_glyph(int x, int y, const char *str_utf8, uint8_t col); #ifdef __EMSCRIPTEN__ -extern int load_mincho_font(void); +extern bool load_mincho_font(void); #endif #endif /* __FONT_H__ */