X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=src%2Fterm%2Fz-term.c;h=59428623a956db7cba0bd18ecbf6dbdaa6381094;hb=2059745285c8cc21b2643a12c8b292093bb60661;hp=f43f6ef3a01635b169ca32f7bd9355267433aaf2;hpb=ec8b4fb2be33d00de001601e41903fde24f15d04;p=hengbandforosx%2Fhengbandosx.git diff --git a/src/term/z-term.c b/src/term/z-term.c index f43f6ef3a..59428623a 100644 --- a/src/term/z-term.c +++ b/src/term/z-term.c @@ -8,12 +8,12 @@ */ #include "term/z-term.h" +#include "game-option/map-screen-options.h" #include "game-option/runtime-arguments.h" #include "game-option/special-options.h" +#include "term/gameterm.h" #include "term/term-color-types.h" #include "term/z-virt.h" -#include "term/gameterm.h" -#include "game-option/map-screen-options.h" /* Special flags in the attr data */ #define AF_BIGTILE2 0xf0 @@ -276,7 +276,6 @@ void term_queue_char(TERM_LEN x, TERM_LEN y, TERM_COLOR a, char c, TERM_COLOR ta */ void term_queue_bigchar(TERM_LEN x, TERM_LEN y, TERM_COLOR a, char c, TERM_COLOR ta, char tc) { - #ifdef JP /* * A table which relates each ascii character to a multibyte @@ -513,7 +512,6 @@ static void term_queue_chars(TERM_LEN x, TERM_LEN y, int n, TERM_COLOR a, concpt * (条件追加:タイルの1文字目でない事を確かめるように。) */ { - int w, h; term_get_size(&w, &h); if (x != w && !(scr_aa[x] & AF_TILE1) && (scr_aa[x] & AF_KANJI2)) { @@ -1023,9 +1021,10 @@ static void term_fresh_row_text(TERM_LEN y, TERM_LEN x1, TERM_LEN x2) } } -bool macro_running(void) { +bool macro_running(void) +{ int diff = angband_term[0]->key_head - angband_term[0]->key_tail; - return diff < -1 || 1 < diff; + return diff < -1 || 1 < diff; } bool need_term_fresh(void) { return !macro_running() || fresh_after; } @@ -2336,4 +2335,4 @@ errr term_nuke(term_type *t) C_KILL(t->key_queue, t->key_size, char); return 0; } -#endif +#endif \ No newline at end of file