RaySollium99/libpicofe
1
0
Fork 0
mirror of https://github.com/RaySollium99/libpicofe.git synced 2025-09-07 07:38:04 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix display of menu strings containing '%'

Browse source
This commit is contained in:
kub 2021-03-26 22:45:04 +01:00
parent de24250ab5
commit cfb49ab909
1 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

18
menu.c
View file

@ -207,10 +207,10 @@ static void smalltext_out16(int x, int y, const char *texto, int color)
if (maxw < 0) if (maxw < 0)
return; return;
strncpy(buffer, texto, sizeof(buffer));
if (maxw > sizeof(buffer) - 1) if (maxw > sizeof(buffer) - 1)
maxw = sizeof(buffer) - 1; maxw = sizeof(buffer) - 1;
strncpy(buffer, texto, maxw);
buffer[maxw] = 0; buffer[maxw] = 0;
smalltext_out16_(x, y, buffer, color); smalltext_out16_(x, y, buffer, color);
@ -601,7 +601,7 @@ static void me_draw(const menu_entry *entries, int sel, void (*draw_more)(void))
name = ent->generate_name(ent->id, &offs); name = ent->generate_name(ent->id, &offs);
} }
if (name != NULL) { if (name != NULL) {
text_out16(x, y, name); text_out16(x, y, "%s", name);
leftname_end = x + (strlen(name) + 1) * me_mfont_w; leftname_end = x + (strlen(name) + 1) * me_mfont_w;
} }
@ -609,7 +609,7 @@ static void me_draw(const menu_entry *entries, int sel, void (*draw_more)(void))
case MB_NONE: case MB_NONE:
break; break;
case MB_OPT_ONOFF: case MB_OPT_ONOFF:
text_out16(x + col2_offs, y, me_read_onoff(ent) ? "ON" : "OFF"); text_out16(x + col2_offs, y, "%s", me_read_onoff(ent) ? "ON" : "OFF");
break; break;
case MB_OPT_RANGE: case MB_OPT_RANGE:
text_out16(x + col2_offs, y, "%i", *(int *)ent->var); text_out16(x + col2_offs, y, "%i", *(int *)ent->var);
@ -650,7 +650,7 @@ static void me_draw(const menu_entry *entries, int sel, void (*draw_more)(void))
h = (g_menuscreen_h - h) / 2; // bottom area height h = (g_menuscreen_h - h) / 2; // bottom area height
if (menu_error_msg[0] != 0) { if (menu_error_msg[0] != 0) {
if (h >= me_mfont_h + 4) if (h >= me_mfont_h + 4)
text_out16(5, g_menuscreen_h - me_mfont_h - 4, menu_error_msg); text_out16(5, g_menuscreen_h - me_mfont_h - 4, "%s", menu_error_msg);
else else
lprintf("menu msg doesn't fit!\n"); lprintf("menu msg doesn't fit!\n");
@ -813,7 +813,7 @@ static void draw_menu_message(const char *msg, void (*draw_more)(void))
menu_draw_begin(1, 0); menu_draw_begin(1, 0);
for (p = msg; *p != 0 && y <= g_menuscreen_h - me_mfont_h; y += me_mfont_h) { for (p = msg; *p != 0 && y <= g_menuscreen_h - me_mfont_h; y += me_mfont_h) {
text_out16(x, y, p); text_out16(x, y, "%s", p);
for (; *p != 0 && *p != '\n'; p++) for (; *p != 0 && *p != '\n'; p++)
; ;
@ -855,7 +855,7 @@ static void do_delete(const char *fpath, const char *fname)
snprintf(tmp + len, sizeof(tmp) - len, "%s - cancel)", nm); snprintf(tmp + len, sizeof(tmp) - len, "%s - cancel)", nm);
len = strlen(tmp); len = strlen(tmp);
text_out16(mid - me_mfont_w * len / 2, 12 * me_mfont_h, tmp); text_out16(mid - me_mfont_w * len / 2, 12 * me_mfont_h, "%s", tmp);
menu_draw_end(); menu_draw_end();
while (in_menu_wait_any(NULL, 50) & (PBTN_MENU|PBTN_MA2)); while (in_menu_wait_any(NULL, 50) & (PBTN_MENU|PBTN_MA2));
@ -1425,13 +1425,13 @@ static void draw_key_config(const me_bind_action *opts, int opt_cnt, int player_
snprintf(buff2, sizeof(buff2), "%s", in_get_key_name(-1, -PBTN_MOK)); snprintf(buff2, sizeof(buff2), "%s", in_get_key_name(-1, -PBTN_MOK));
snprintf(buff, sizeof(buff), "%s - bind, %s - clear", buff2, snprintf(buff, sizeof(buff), "%s - bind, %s - clear", buff2,
in_get_key_name(-1, -PBTN_MA2)); in_get_key_name(-1, -PBTN_MA2));
text_out16(x, g_menuscreen_h - 4 * me_mfont_h, buff); text_out16(x, g_menuscreen_h - 4 * me_mfont_h, "%s", buff);
} }
else else
text_out16(x, g_menuscreen_h - 4 * me_mfont_h, "Press a button to bind/unbind"); text_out16(x, g_menuscreen_h - 4 * me_mfont_h, "Press a button to bind/unbind");
if (dev_count > 1) { if (dev_count > 1) {
text_out16(x, g_menuscreen_h - 3 * me_mfont_h, dev_name); text_out16(x, g_menuscreen_h - 3 * me_mfont_h, "%s", dev_name);
text_out16(x, g_menuscreen_h - 2 * me_mfont_h, "Press left/right for other devs"); text_out16(x, g_menuscreen_h - 2 * me_mfont_h, "Press left/right for other devs");
} }