From: Deskull Date: Mon, 12 Nov 2018 14:05:08 +0000 (+0900) Subject: [Refactor] #37287 #37353 型の置換。 / Type replacement. X-Git-Tag: vmacos2.2.1-7a~1270 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=af186ae605e019f73e4392695ddaadd3b7f0c86f;p=hengbandforosx%2Fhengbandosx.git [Refactor] #37287 #37353 型の置換。 / Type replacement. --- diff --git a/src/cave.c b/src/cave.c index 7c53d87d1..230adfec0 100644 --- a/src/cave.c +++ b/src/cave.c @@ -716,7 +716,7 @@ static void image_object(TERM_COLOR *ap, char *cp) * @param cp 本来のシンボル * @return なし */ -static void image_random(byte *ap, char *cp) +static void image_random(TERM_COLOR *ap, char *cp) { /* Normally, assume monsters */ if (randint0(100) < 75) diff --git a/src/cmd4.c b/src/cmd4.c index b038f3ac5..0dbb7d718 100644 --- a/src/cmd4.c +++ b/src/cmd4.c @@ -6382,7 +6382,7 @@ static void browser_cursor(char ch, int *column, IDX *grp_cur, int grp_cnt, /* * Display visuals. */ -static void display_visual_list(int col, int row, int height, int width, byte attr_top, byte char_left) +static void display_visual_list(int col, int row, int height, int width, TERM_COLOR attr_top, byte char_left) { int i, j; @@ -6465,7 +6465,7 @@ static byte char_idx_feat[F_LIT_MAX]; */ static bool visual_mode_command(char ch, bool *visual_list_ptr, int height, int width, - byte *attr_top_ptr, byte *char_left_ptr, + TERM_COLOR *attr_top_ptr, byte *char_left_ptr, TERM_COLOR *cur_attr_ptr, byte *cur_char_ptr, bool *need_redraw) { static TERM_COLOR attr_old = 0; @@ -6672,7 +6672,8 @@ static void do_cmd_knowledge_monsters(bool *need_redraw, bool visual_only, IDX d bool redraw; bool visual_list = FALSE; - byte attr_top = 0, char_left = 0; + TERM_COLOR attr_top = 0; + byte char_left = 0; int browser_rows; TERM_LEN wid, hgt; @@ -7052,7 +7053,8 @@ static void do_cmd_knowledge_objects(bool *need_redraw, bool visual_only, IDX di bool redraw; bool visual_list = FALSE; - byte attr_top = 0, char_left = 0; + TERM_COLOR attr_top = 0; + byte char_left = 0; int browser_rows; int wid, hgt; @@ -7421,7 +7423,8 @@ static void do_cmd_knowledge_features(bool *need_redraw, bool visual_only, IDX d TERM_COLOR attr_old[F_LIT_MAX]; byte char_old[F_LIT_MAX]; - byte *cur_attr_ptr, *cur_char_ptr; + TERM_COLOR *cur_attr_ptr; + byte *cur_char_ptr; (void)C_WIPE(attr_old, F_LIT_MAX, byte); (void)C_WIPE(char_old, F_LIT_MAX, byte); diff --git a/src/z-term.c b/src/z-term.c index 36de55623..032cbdedd 100644 --- a/src/z-term.c +++ b/src/z-term.c @@ -2064,10 +2064,10 @@ errr Term_erase(TERM_LEN x, TERM_LEN y, int n) int na = Term->attr_blank; int nc = Term->char_blank; - byte *scr_aa; + TERM_COLOR *scr_aa; char *scr_cc; - byte *scr_taa; + TERM_COLOR *scr_taa; char *scr_tcc; /* Place cursor */