[Refactor] #37287 #37353 型の置換。 / Type replacement.

diff --git a/src/cmd4.c b/src/cmd4.c
index 66657c8..e9cf640 100644 (file)
--- a/src/cmd4.c
+++ b/src/cmd4.c
@@ -6434,13 +6434,13 @@ static void display_visual_list(int col, int row, int height, int width, byte at
 /*
  * Place the cursor at the collect position for visual mode
  */
-static void place_visual_list_cursor(int col, int row, byte a, byte c, byte attr_top, byte char_left)
+static void place_visual_list_cursor(TERM_POSITION col, TERM_POSITION row, byte a, byte c, byte attr_top, byte char_left)
 {
        int i = (a & 0x7f) - attr_top;
        int j = c - char_left;
 
-       int x = col + j;
-       int y = row + i;
+       TERM_POSITION x = col + j;
+       TERM_POSITION y = row + i;
 
        /* Bigtile mode uses double width */
        if (use_bigtile) x += j;
@@ -8361,7 +8361,7 @@ static void do_cmd_knowledge_home(void)
                if (st_ptr->stock_num)
                {
 #ifdef JP
-                       int x = 1;
+                       TERM_POSITION x = 1;
 #endif
                        /* Header with name of the town */
                        fprintf(fff, _("  [ 我が家のアイテム ]\n", "  [Home Inventory]\n"));

diff --git a/src/melee1.c b/src/melee1.c
index 36b2c1d..3b4936c 100644 (file)
--- a/src/melee1.c
+++ b/src/melee1.c
@@ -434,9 +434,9 @@ static void natural_attack(s16b m_idx, int attack, bool *fear, bool *mdeath)
 * @details
 * If no "weapon" is available, then "punch" the monster one time.
 */
-static void py_attack_aux(int y, int x, bool *fear, bool *mdeath, s16b hand, BIT_FLAGS mode)
+static void py_attack_aux(POSITION y, POSITION x, bool *fear, bool *mdeath, s16b hand, BIT_FLAGS mode)
 {
-       int             num = 0, bonus, chance, vir;
+       int num = 0, bonus, chance, vir;
        HIT_POINT k;
 
        cave_type       *c_ptr = &cave[y][x];

diff --git a/src/spells1.c b/src/spells1.c
index 0cce53c..c5bb47f 100644 (file)
--- a/src/spells1.c
+++ b/src/spells1.c
@@ -110,7 +110,7 @@ static void next_mirror(int* next_y, int* next_x, int cury, int curx)
 {
        int mirror_x[10], mirror_y[10]; /* 鏡はもっと少ない */
        int mirror_num = 0;                       /* 鏡の数 */
-       int x, y;
+       POSITION x, y;
        int num;
 
        for (x = 0; x < cur_wid; x++)
@@ -704,10 +704,10 @@ static POSITION monster_target_y; /*!< モンスターの攻撃目標Y座標 */
  * XXX XXX XXX Perhaps we should affect doors?
  * </pre>
  */
-static bool project_f(int who, int r, int y, int x, HIT_POINT dam, int typ)
+static bool project_f(int who, POSITION r, POSITION y, POSITION x, HIT_POINT dam, int typ)
 {
-       cave_type          *c_ptr = &cave[y][x];
-       feature_type    *f_ptr = &f_info[c_ptr->feat];
+       cave_type *c_ptr = &cave[y][x];
+       feature_type *f_ptr = &f_info[c_ptr->feat];
 
        bool obvious = FALSE;
        bool known = player_has_los_bold(y, x);
@@ -6546,13 +6546,13 @@ void breath_shape(u16b *path_g, int dist, int *pgrids, POSITION *gx, POSITION *g
 
        while (bdis <= mdis)
        {
-               int x, y;
+               POSITION x, y;
 
                if ((0 < dist) && (path_n < dist))
                {
-                       int ny = GRID_Y(path_g[path_n]);
-                       int nx = GRID_X(path_g[path_n]);
-                       int nd = distance(ny, nx, y1, x1);
+                       POSITION ny = GRID_Y(path_g[path_n]);
+                       POSITION nx = GRID_X(path_g[path_n]);
+                       POSITION nd = distance(ny, nx, y1, x1);
 
                        /* Get next base point */
                        if (bdis >= nd)
@@ -7836,63 +7836,62 @@ bool project(MONSTER_IDX who, POSITION rad, POSITION y, POSITION x, HIT_POINT da
  * @param dam ダメージ量
  * @return 効果があったらTRUEを返す
  */
-bool binding_field( HIT_POINT dam )
+bool binding_field(HIT_POINT dam)
 {
-       int mirror_x[10],mirror_y[10]; /* 鏡はもっと少ない */
-       int mirror_num=0;                         /* 鏡の数 */
-       int x,y;
-       int centersign;
-       int x1,x2,y1,y2;
+       POSITION mirror_x[10], mirror_y[10]; /* 鏡はもっと少ない */
+       int mirror_num = 0;                       /* 鏡の数 */
+       POSITION x, y;
+       POSITION centersign;
+       POSITION x1, x2, y1, y2;
        u16b p;
-       int msec= delay_factor*delay_factor*delay_factor;
+       int msec = delay_factor*delay_factor*delay_factor;
 
        /* 三角形の頂点 */
-       int point_x[3];
-       int point_y[3];
+       POSITION point_x[3];
+       POSITION point_y[3];
 
        /* Default target of monsterspell is player */
-       monster_target_y=p_ptr->y;
-       monster_target_x=p_ptr->x;
+       monster_target_y = p_ptr->y;
+       monster_target_x = p_ptr->x;
 
-       for( x=0 ; x < cur_wid ; x++ )
+       for (x = 0; x < cur_wid; x++)
        {
-               for( y=0 ; y < cur_hgt ; y++ )
+               for (y = 0; y < cur_hgt; y++)
                {
-                       if( is_mirror_grid(&cave[y][x]) &&
-                               distance(p_ptr->y,p_ptr->x,y,x) <= MAX_RANGE &&
-                               distance(p_ptr->y,p_ptr->x,y,x) != 0 &&
-                               player_has_los_bold(y,x) &&
+                       if (is_mirror_grid(&cave[y][x]) &&
+                               distance(p_ptr->y, p_ptr->x, y, x) <= MAX_RANGE &&
+                               distance(p_ptr->y, p_ptr->x, y, x) != 0 &&
+                               player_has_los_bold(y, x) &&
                                projectable(p_ptr->y, p_ptr->x, y, x)
-                               ){
-                               mirror_y[mirror_num]=y;
-                               mirror_x[mirror_num]=x;
+                               ) {
+                               mirror_y[mirror_num] = y;
+                               mirror_x[mirror_num] = x;
                                mirror_num++;
                        }
                }
        }
 
-       if( mirror_num < 2 )return FALSE;
+       if (mirror_num < 2)return FALSE;
 
-       point_x[0] = randint0( mirror_num );
+       point_x[0] = randint0(mirror_num);
        do {
-         point_x[1] = randint0( mirror_num );
-       }
-       while( point_x[0] == point_x[1] );
-
-       point_y[0]=mirror_y[point_x[0]];
-       point_x[0]=mirror_x[point_x[0]];
-       point_y[1]=mirror_y[point_x[1]];
-       point_x[1]=mirror_x[point_x[1]];
-       point_y[2]=p_ptr->y;
-       point_x[2]=p_ptr->x;
-
-       x=point_x[0]+point_x[1]+point_x[2];
-       y=point_y[0]+point_y[1]+point_y[2];
-
-       centersign = (point_x[0]*3-x)*(point_y[1]*3-y)
-               - (point_y[0]*3-y)*(point_x[1]*3-x);
-       if( centersign == 0 )return FALSE;
-                               
+               point_x[1] = randint0(mirror_num);
+       } while (point_x[0] == point_x[1]);
+
+       point_y[0] = mirror_y[point_x[0]];
+       point_x[0] = mirror_x[point_x[0]];
+       point_y[1] = mirror_y[point_x[1]];
+       point_x[1] = mirror_x[point_x[1]];
+       point_y[2] = p_ptr->y;
+       point_x[2] = p_ptr->x;
+
+       x = point_x[0] + point_x[1] + point_x[2];
+       y = point_y[0] + point_y[1] + point_y[2];
+
+       centersign = (point_x[0] * 3 - x)*(point_y[1] * 3 - y)
+               - (point_y[0] * 3 - y)*(point_x[1] * 3 - x);
+       if (centersign == 0)return FALSE;
+
        x1 = point_x[0] < point_x[1] ? point_x[0] : point_x[1];
        x1 = x1 < point_x[2] ? x1 : point_x[2];
        y1 = point_y[0] < point_y[1] ? point_y[0] : point_y[1];
@@ -7903,78 +7902,78 @@ bool binding_field( HIT_POINT dam )
        y2 = point_y[0] > point_y[1] ? point_y[0] : point_y[1];
        y2 = y2 > point_y[2] ? y2 : point_y[2];
 
-       for( y=y1 ; y <=y2 ; y++ ){
-               for( x=x1 ; x <=x2 ; x++ ){
-                       if( centersign*( (point_x[0]-x)*(point_y[1]-y)
-                                        -(point_y[0]-y)*(point_x[1]-x)) >=0 &&
-                               centersign*( (point_x[1]-x)*(point_y[2]-y)
-                                        -(point_y[1]-y)*(point_x[2]-x)) >=0 &&
-                               centersign*( (point_x[2]-x)*(point_y[0]-y)
-                                        -(point_y[2]-y)*(point_x[0]-x)) >=0 )
+       for (y = y1; y <= y2; y++) {
+               for (x = x1; x <= x2; x++) {
+                       if (centersign*((point_x[0] - x)*(point_y[1] - y)
+                               - (point_y[0] - y)*(point_x[1] - x)) >= 0 &&
+                               centersign*((point_x[1] - x)*(point_y[2] - y)
+                                       - (point_y[1] - y)*(point_x[2] - x)) >= 0 &&
+                               centersign*((point_x[2] - x)*(point_y[0] - y)
+                                       - (point_y[2] - y)*(point_x[0] - x)) >= 0)
                        {
                                if (player_has_los_bold(y, x) && projectable(p_ptr->y, p_ptr->x, y, x)) {
                                        /* Visual effects */
-                                       if(!(p_ptr->blind)
-                                          && panel_contains(y,x)){
-                                         p = bolt_pict(y,x,y,x, GF_MANA );
-                                         print_rel(PICT_C(p), PICT_A(p),y,x);
-                                         move_cursor_relative(y, x);
-                                         /*if (fresh_before)*/ Term_fresh();
-                                         Term_xtra(TERM_XTRA_DELAY, msec);
+                                       if (!(p_ptr->blind)
+                                               && panel_contains(y, x)) {
+                                               p = bolt_pict(y, x, y, x, GF_MANA);
+                                               print_rel(PICT_C(p), PICT_A(p), y, x);
+                                               move_cursor_relative(y, x);
+                                               /*if (fresh_before)*/ Term_fresh();
+                                               Term_xtra(TERM_XTRA_DELAY, msec);
                                        }
                                }
                        }
                }
        }
-       for( y=y1 ; y <=y2 ; y++ ){
-               for( x=x1 ; x <=x2 ; x++ ){
-                       if( centersign*( (point_x[0]-x)*(point_y[1]-y)
-                                        -(point_y[0]-y)*(point_x[1]-x)) >=0 &&
-                               centersign*( (point_x[1]-x)*(point_y[2]-y)
-                                        -(point_y[1]-y)*(point_x[2]-x)) >=0 &&
-                               centersign*( (point_x[2]-x)*(point_y[0]-y)
-                                        -(point_y[2]-y)*(point_x[0]-x)) >=0 )
+       for (y = y1; y <= y2; y++) {
+               for (x = x1; x <= x2; x++) {
+                       if (centersign*((point_x[0] - x)*(point_y[1] - y)
+                               - (point_y[0] - y)*(point_x[1] - x)) >= 0 &&
+                               centersign*((point_x[1] - x)*(point_y[2] - y)
+                                       - (point_y[1] - y)*(point_x[2] - x)) >= 0 &&
+                               centersign*((point_x[2] - x)*(point_y[0] - y)
+                                       - (point_y[2] - y)*(point_x[0] - x)) >= 0)
                        {
                                if (player_has_los_bold(y, x) && projectable(p_ptr->y, p_ptr->x, y, x)) {
-                                       (void)project_f(0,0,y,x,dam,GF_MANA); 
+                                       (void)project_f(0, 0, y, x, dam, GF_MANA);
                                }
                        }
                }
        }
-       for( y=y1 ; y <=y2 ; y++ ){
-               for( x=x1 ; x <=x2 ; x++ ){
-                       if( centersign*( (point_x[0]-x)*(point_y[1]-y)
-                                        -(point_y[0]-y)*(point_x[1]-x)) >=0 &&
-                               centersign*( (point_x[1]-x)*(point_y[2]-y)
-                                        -(point_y[1]-y)*(point_x[2]-x)) >=0 &&
-                               centersign*( (point_x[2]-x)*(point_y[0]-y)
-                                        -(point_y[2]-y)*(point_x[0]-x)) >=0 )
+       for (y = y1; y <= y2; y++) {
+               for (x = x1; x <= x2; x++) {
+                       if (centersign*((point_x[0] - x)*(point_y[1] - y)
+                               - (point_y[0] - y)*(point_x[1] - x)) >= 0 &&
+                               centersign*((point_x[1] - x)*(point_y[2] - y)
+                                       - (point_y[1] - y)*(point_x[2] - x)) >= 0 &&
+                               centersign*((point_x[2] - x)*(point_y[0] - y)
+                                       - (point_y[2] - y)*(point_x[0] - x)) >= 0)
                        {
                                if (player_has_los_bold(y, x) && projectable(p_ptr->y, p_ptr->x, y, x)) {
-                                       (void)project_o(0,0,y,x,dam,GF_MANA); 
+                                       (void)project_o(0, 0, y, x, dam, GF_MANA);
                                }
                        }
                }
        }
-       for( y=y1 ; y <=y2 ; y++ ){
-               for( x=x1 ; x <=x2 ; x++ ){
-                       if( centersign*( (point_x[0]-x)*(point_y[1]-y)
-                                        -(point_y[0]-y)*(point_x[1]-x)) >=0 &&
-                               centersign*( (point_x[1]-x)*(point_y[2]-y)
-                                        -(point_y[1]-y)*(point_x[2]-x)) >=0 &&
-                               centersign*( (point_x[2]-x)*(point_y[0]-y)
-                                        -(point_y[2]-y)*(point_x[0]-x)) >=0 )
+       for (y = y1; y <= y2; y++) {
+               for (x = x1; x <= x2; x++) {
+                       if (centersign*((point_x[0] - x)*(point_y[1] - y)
+                               - (point_y[0] - y)*(point_x[1] - x)) >= 0 &&
+                               centersign*((point_x[1] - x)*(point_y[2] - y)
+                                       - (point_y[1] - y)*(point_x[2] - x)) >= 0 &&
+                               centersign*((point_x[2] - x)*(point_y[0] - y)
+                                       - (point_y[2] - y)*(point_x[0] - x)) >= 0)
                        {
                                if (player_has_los_bold(y, x) && projectable(p_ptr->y, p_ptr->x, y, x)) {
-                                       (void)project_m(0,0,y,x,dam,GF_MANA,
-                                         (PROJECT_GRID|PROJECT_ITEM|PROJECT_KILL|PROJECT_JUMP),TRUE);
+                                       (void)project_m(0, 0, y, x, dam, GF_MANA,
+                                               (PROJECT_GRID | PROJECT_ITEM | PROJECT_KILL | PROJECT_JUMP), TRUE);
                                }
                        }
                }
        }
-       if( one_in_(7) ){
+       if (one_in_(7)) {
                msg_print(_("鏡が結界に耐えきれず、壊れてしまった。", "The field broke a mirror"));
-               remove_mirror(point_y[0],point_x[0]);
+               remove_mirror(point_y[0], point_x[0]);
        }
 
        return TRUE;

diff --git a/src/wild.c b/src/wild.c
index 3804b80..d5eecf0 100644 (file)
--- a/src/wild.c
+++ b/src/wild.c
@@ -315,9 +315,9 @@ static void generate_wilderness_area(int terrain, u32b seed, bool border, bool c
  * If corner is set then only the corners of the area are needed.
  * </pre>
  */
-static void generate_area(int y, int x, bool border, bool corner)
+static void generate_area(POSITION y, POSITION x, bool border, bool corner)
 {
-       int x1, y1;
+       POSITION x1, y1;
 
        /* Number of the town (if any) */
        p_ptr->town_num = (s16b)wilderness[y][x].town;
@@ -916,7 +916,7 @@ errr parse_line_wilderness(char *buf, int ymin, int xmin, int ymax, int xmax, in
  */
 void seed_wilderness(void)
 {
-       int x, y;
+       POSITION x, y;
 
        /* Init wilderness seeds */
        for (x = 0; x < max_wild_x; x++)

diff --git a/src/xtra1.c b/src/xtra1.c
index 2d5c6fe..61225bb 100644 (file)
--- a/src/xtra1.c
+++ b/src/xtra1.c
@@ -1733,7 +1733,7 @@ static void fix_inven(void)
  * @return なし
  * </pre>
  */
-static void print_monster_line(int x, int y, monster_type* m_ptr, int n_same){
+static void print_monster_line(TERM_POSITION x, TERM_POSITION y, monster_type* m_ptr, int n_same){
        char buf[256];
        int i;
        MONRACE_IDX r_idx = m_ptr->ap_r_idx;
@@ -1780,8 +1780,8 @@ static void print_monster_line(int x, int y, monster_type* m_ptr, int n_same){
  * @param y 表示行
  * @param max_lines 最大何行描画するか
  */
-void print_monster_list(int x, int y, int max_lines){
-       int line = y;
+void print_monster_list(TERM_POSITION x, TERM_POSITION y, TERM_POSITION max_lines){
+       TERM_POSITION line = y;
        monster_type* last_mons = NULL;
        monster_type* m_ptr = NULL;
        int n_same = 0;
@@ -1992,8 +1992,8 @@ static void fix_player(void)
 static void fix_message(void)
 {
        int j, i;
-       int w, h;
-       int x, y;
+       TERM_POSITION w, h;
+       TERM_POSITION x, y;
 
        /* Scan windows */
        for (j = 0; j < 8; j++)

diff --git a/src/xtra2.c b/src/xtra2.c
index 91efa91..c7481fd 100644 (file)
--- a/src/xtra2.c
+++ b/src/xtra2.c
@@ -425,10 +425,10 @@ void complete_quest(int quest_num)
  * @brief 現在フロアに残っている敵モンスターの数を返す /
  * @return 現在の敵モンスターの数
  */
-static int count_all_hostile_monsters(void)
+static MONSTER_NUMBER count_all_hostile_monsters(void)
 {
-       int x, y;
-       int number_mon = 0;
+       POSITION x, y;
+       MONSTER_NUMBER number_mon = 0;
 
        for (x = 0; x < cur_wid; ++ x)
        {
@@ -438,7 +438,7 @@ static int count_all_hostile_monsters(void)
 
                        if (m_idx > 0 && is_hostile(&m_list[m_idx]))
                        {
-                               ++ number_mon;
+                               ++number_mon;
                        }
                }
        }
@@ -2224,8 +2224,8 @@ bool change_panel_xy(int y, int x)
  */
 void verify_panel(void)
 {
-       int y = p_ptr->y;
-       int x = p_ptr->x;
+       POSITION y = p_ptr->y;
+       POSITION x = p_ptr->x;
        int wid, hgt;
 
        int prow_min;
@@ -2764,8 +2764,7 @@ static POSITION_IDX target_pick(POSITION y1, POSITION x1, POSITION dy, POSITION
 static bool target_set_accept(int y, int x)
 {
        cave_type *c_ptr;
-
-       s16b this_o_idx, next_o_idx = 0;
+       OBJECT_IDX this_o_idx, next_o_idx = 0;
 
        /* Bounds */
        if (!(in_bounds(y, x))) return (FALSE);
@@ -2773,11 +2772,9 @@ static bool target_set_accept(int y, int x)
        /* Player grid is always interesting */
        if (player_bold(y, x)) return (TRUE);
 
-
        /* Handle hallucination */
        if (p_ptr->image) return (FALSE);
 
-
        /* Examine the grid */
        c_ptr = &cave[y][x];