From: deskull Date: Sun, 24 Jan 2021 02:09:42 +0000 (+0900) Subject: Merge remote-tracking branch 'remotes/origin/Feature/Fix-English-Bugs' into develop X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=fce06e16aa43788623ede56c23a139373be87c8d;hp=ae235e3e68968e2332bdfa0e3c29f788b0ee907d;p=hengband%2Fhengband.git Merge remote-tracking branch 'remotes/origin/Feature/Fix-English-Bugs' into develop --- diff --git a/src/wizard/spoiler-util.c b/src/wizard/spoiler-util.c index 73e52e4e8..ffaf75c10 100644 --- a/src/wizard/spoiler-util.c +++ b/src/wizard/spoiler-util.c @@ -114,9 +114,9 @@ void spoil_out(concptr str) if (!wrap) { #ifdef JP - if (roff_p >= roff_buf + (k_flag ? 74 : 75)) + if (roff_p >= roff_buf + (iskanji_flag ? 74 : 75)) wrap = TRUE; - else if ((ch == ' ') && (roff_p >= roff_buf + (k_flag ? 72 : 73))) + else if ((ch == ' ') && (roff_p >= roff_buf + (iskanji_flag ? 72 : 73))) wrap = TRUE; #else if (roff_p >= roff_buf + 75) @@ -129,7 +129,7 @@ void spoil_out(concptr str) #ifdef JP bool k_flag_local; bool iskanji_flag_local = FALSE; - concptr tail = str + (k_flag ? 2 : 1); + concptr tail = str + (iskanji_flag ? 2 : 1); #else concptr tail = str + 1; #endif