From 04c1fb4dc3d4f2eccc54c3405d479e928380fe36 Mon Sep 17 00:00:00 2001 From: Deskull Date: Fri, 4 Jan 2019 11:16:54 +0900 Subject: [PATCH] =?utf8?q?[Refactor]=20#37353=20=E5=9E=8B=E3=81=AE?= =?utf8?q?=E7=BD=AE=E6=8F=9B=E3=80=82=20/=20Type=20replacement.?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- src/scores.c | 4 ++-- src/xtra1.c | 12 ++++++------ src/xtra2.c | 6 +++--- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/scores.c b/src/scores.c index 925571f42..c19d492f4 100644 --- a/src/scores.c +++ b/src/scores.c @@ -841,8 +841,8 @@ void race_legends(void) */ void kingly(void) { - int wid, hgt; - int cx, cy; + TERM_LEN wid, hgt; + TERM_LEN cx, cy; bool seppuku = streq(p_ptr->died_from, "Seppuku"); /* Hack -- retire in town */ diff --git a/src/xtra1.c b/src/xtra1.c index 5797b2db5..cd943e217 100644 --- a/src/xtra1.c +++ b/src/xtra1.c @@ -509,7 +509,7 @@ static struct { static void prt_status(void) { u32b bar_flags[3]; - int wid, hgt, row_statbar, max_col_statbar; + TERM_LEN wid, hgt, row_statbar, max_col_statbar; int i, col = 0, num = 0; int space = 2; @@ -990,7 +990,7 @@ static void prt_sp(void) static void prt_depth(void) { char depths[32]; - int wid, hgt, row_depth, col_depth; + TERM_LEN wid, hgt, row_depth, col_depth; byte attr = TERM_WHITE; Term_get_size(&wid, &hgt); @@ -1243,7 +1243,7 @@ static void prt_speed(void) byte attr = TERM_WHITE; char buf[32] = ""; - int wid, hgt, row_speed, col_speed; + TERM_LEN wid, hgt, row_speed, col_speed; Term_get_size(&wid, &hgt); col_speed = wid + COL_SPEED; @@ -1309,7 +1309,7 @@ static void prt_speed(void) */ static void prt_study(void) { - int wid, hgt, row_study, col_study; + TERM_LEN wid, hgt, row_study, col_study; Term_get_size(&wid, &hgt); col_study = wid + COL_STUDY; @@ -1332,7 +1332,7 @@ static void prt_study(void) */ static void prt_imitation(void) { - int wid, hgt, row_study, col_study; + TERM_LEN wid, hgt, row_study, col_study; Term_get_size(&wid, &hgt); col_study = wid + COL_STUDY; @@ -2013,7 +2013,7 @@ static void fix_overhead(void) for (j = 0; j < 8; j++) { term *old = Term; - int wid, hgt; + TERM_LEN wid, hgt; /* No window */ if (!angband_term[j]) continue; diff --git a/src/xtra2.c b/src/xtra2.c index 357a2c7c7..4fb8b7f91 100644 --- a/src/xtra2.c +++ b/src/xtra2.c @@ -1782,7 +1782,7 @@ void get_screen_size(TERM_LEN *wid_p, TERM_LEN *hgt_p) */ void panel_bounds_center(void) { - int wid, hgt; + TERM_LEN wid, hgt; get_screen_size(&wid, &hgt); @@ -1940,7 +1940,7 @@ void verify_panel(void) { POSITION y = p_ptr->y; POSITION x = p_ptr->x; - int wid, hgt; + TERM_LEN wid, hgt; int prow_min; int pcol_min; @@ -4765,7 +4765,7 @@ bool tgt_pt(POSITION *x_ptr, POSITION *y_ptr) POSITION x, y; bool success = FALSE; - int wid, hgt; + TERM_LEN wid, hgt; get_screen_size(&wid, &hgt); -- 2.11.0