OSDN Git Service
(root)
/
hengbandforosx
/
hengbandosx.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[Refactor] 無駄な空白、改行の削除、includeのソート
[hengbandforosx/hengbandosx.git]
/
src
/
term
/
z-term.c
diff --git
a/src/term/z-term.c
b/src/term/z-term.c
index
57e60ec
..
5942862
100644
(file)
--- a/
src/term/z-term.c
+++ b/
src/term/z-term.c
@@
-8,8
+8,10
@@
*/
#include "term/z-term.h"
*/
#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 "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/term-color-types.h"
#include "term/z-virt.h"
@@
-274,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)
{
*/
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
#ifdef JP
/*
* A table which relates each ascii character to a multibyte
@@
-511,7
+512,6
@@
static void term_queue_chars(TERM_LEN x, TERM_LEN y, int n, TERM_COLOR a, concpt
* (条件追加:タイルの1文字目でない事を確かめるように。)
*/
{
* (条件追加:タイルの1文字目でない事を確かめるように。)
*/
{
-
int w, h;
term_get_size(&w, &h);
if (x != w && !(scr_aa[x] & AF_TILE1) && (scr_aa[x] & AF_KANJI2)) {
int w, h;
term_get_size(&w, &h);
if (x != w && !(scr_aa[x] & AF_TILE1) && (scr_aa[x] & AF_KANJI2)) {
@@
-1021,6
+1021,13
@@
static void term_fresh_row_text(TERM_LEN y, TERM_LEN x1, TERM_LEN x2)
}
}
}
}
+bool macro_running(void)
+{
+ int diff = angband_term[0]->key_head - angband_term[0]->key_tail;
+ return diff < -1 || 1 < diff;
+}
+
+bool need_term_fresh(void) { return !macro_running() || fresh_after; }
/*
* @brief Actually perform all requested changes to the window
*/
/*
* @brief Actually perform all requested changes to the window
*/
@@
-1943,7
+1950,7
@@
errr term_load(void)
/*
* Exchange the "requested" screen with the "tmp" screen
*/
/*
* Exchange the "requested" screen with the "tmp" screen
*/
-
static
errr term_exchange(void)
+errr term_exchange(void)
{
TERM_LEN w = Term->wid;
TERM_LEN h = Term->hgt;
{
TERM_LEN w = Term->wid;
TERM_LEN h = Term->hgt;
@@
-2328,4
+2335,4
@@
errr term_nuke(term_type *t)
C_KILL(t->key_queue, t->key_size, char);
return 0;
}
C_KILL(t->key_queue, t->key_size, char);
return 0;
}
-#endif
+#endif
\ No newline at end of file