変愚蛮怒のメインリポジトリです
Revision | 04106ec34bc42285d98bbf587f5e48247d98dbc9 (tree) |
---|---|
Time | 2019-01-06 08:11:49 |
Author | Deskull <deskull@user...> |
Commiter | Deskull |
[Refactor] #37353 型の置換。 / Type replacement.
@@ -453,7 +453,7 @@ static void autopick_entry_from_object(autopick_type *entry, object_type *o_ptr) | ||
453 | 453 | bool bol_mark = TRUE; |
454 | 454 | #endif |
455 | 455 | |
456 | - char name_str[MAX_NLEN]; | |
456 | + GAME_TEXT name_str[MAX_NLEN]; | |
457 | 457 | |
458 | 458 | /* Initialize name string */ |
459 | 459 | name_str[0] = '\0'; |
@@ -754,7 +754,7 @@ static cptr pickpref_filename(int filename_mode) | ||
754 | 754 | */ |
755 | 755 | void autopick_load_pref(bool disp_mes) |
756 | 756 | { |
757 | - char buf[80]; | |
757 | + GAME_TEXT buf[80]; | |
758 | 758 | errr err; |
759 | 759 | |
760 | 760 | /* Free old entries */ |
@@ -29,7 +29,7 @@ | ||
29 | 29 | */ |
30 | 30 | bool stop_hex_spell_all(void) |
31 | 31 | { |
32 | - int i; | |
32 | + SPELL_IDX i; | |
33 | 33 | |
34 | 34 | for (i = 0; i < 32; i++) |
35 | 35 | { |
@@ -166,13 +166,11 @@ void check_hex(void) | ||
166 | 166 | } |
167 | 167 | } |
168 | 168 | |
169 | - | |
170 | 169 | /* Culcurates final mana cost */ |
171 | 170 | need_mana_frac = 0; |
172 | 171 | s64b_div(&need_mana, &need_mana_frac, 0, 3); /* Divide by 3 */ |
173 | 172 | need_mana += (CASTING_HEX_NUM(p_ptr) - 1); |
174 | 173 | |
175 | - | |
176 | 174 | /* Not enough mana */ |
177 | 175 | if (s64b_cmp(p_ptr->csp, p_ptr->csp_frac, need_mana, need_mana_frac) < 0) |
178 | 176 | { |
@@ -110,7 +110,7 @@ s16b modify_stat_value(int value, int amount) | ||
110 | 110 | * @param col 描画行 |
111 | 111 | * @return なし |
112 | 112 | */ |
113 | -static void prt_field(cptr info, int row, int col) | |
113 | +static void prt_field(cptr info, TERM_LEN row, TERM_LEN col) | |
114 | 114 | { |
115 | 115 | /* Dump 13 spaces to clear */ |
116 | 116 | c_put_str(TERM_WHITE, " ", row, col); |
@@ -168,7 +168,7 @@ cptr map_name(void) | ||
168 | 168 | static void prt_dungeon(void) |
169 | 169 | { |
170 | 170 | cptr dungeon_name; |
171 | - int col; | |
171 | + TERM_LEN col; | |
172 | 172 | |
173 | 173 | /* Dump 13 spaces to clear */ |
174 | 174 | c_put_str(TERM_WHITE, " ", ROW_DUNGEON, COL_DUNGEON); |
@@ -466,9 +466,10 @@ static struct { | ||
466 | 466 | */ |
467 | 467 | static void prt_status(void) |
468 | 468 | { |
469 | - u32b bar_flags[3]; | |
469 | + BIT_FLAGS bar_flags[3]; | |
470 | 470 | TERM_LEN wid, hgt, row_statbar, max_col_statbar; |
471 | - int i, col = 0, num = 0; | |
471 | + int i; | |
472 | + TERM_LEN col = 0, num = 0; | |
472 | 473 | int space = 2; |
473 | 474 | |
474 | 475 | Term_get_size(&wid, &hgt); |
@@ -700,7 +701,7 @@ static void prt_status(void) | ||
700 | 701 | static void prt_title(void) |
701 | 702 | { |
702 | 703 | cptr p = ""; |
703 | - char str[14]; | |
704 | + GAME_TEXT str[14]; | |
704 | 705 | |
705 | 706 | if (p_ptr->wizard) |
706 | 707 | { |