#37287 #37353 (2.2.0.89) 型の置換を継続中。ソースファイル整形、 / Ongoing type replacement. Reformat...

diff --git a/src/cave.c b/src/cave.c
index 7f426a8..1aa5d1e 100644 (file)
--- a/src/cave.c
+++ b/src/cave.c
@@ -2988,7 +2988,7 @@ void update_mon_lite(void)
        int i, rad;
        cave_type *c_ptr;
 
-       s16b fx, fy;
+       POSITION fx, fy;
        void (*add_mon_lite)(int, int);
        int f_flag;
 
@@ -4547,7 +4547,7 @@ void wiz_dark(void)
 /*
  * Change the "feat" flag for a grid, and notice/redraw the grid
  */
-void cave_set_feat(int y, int x, int feat)
+void cave_set_feat(POSITION y, POSITION x, IDX feat)
 {
        cave_type *c_ptr = &cave[y][x];
        feature_type *f_ptr = &f_info[feat];

diff --git a/src/externs.h b/src/externs.h
index 8f3e449..bc843d9 100644 (file)
--- a/src/externs.h
+++ b/src/externs.h
@@ -678,7 +678,7 @@ extern void update_smell(void);
 extern void map_area(int range);
 extern void wiz_lite(bool ninja);
 extern void wiz_dark(void);
-extern void cave_set_feat(int y, int x, int feat);
+extern void cave_set_feat(POSITION y, POSITION x, IDX feat);
 extern int conv_dungeon_feat(int newfeat);
 extern int feat_state(int feat, int action);
 extern void cave_alter_feat(int y, int x, int action);
@@ -688,7 +688,7 @@ extern bool is_glyph_grid(cave_type *c_ptr);
 extern bool is_explosive_rune_grid(cave_type *c_ptr);
 extern void mmove2(int *y, int *x, int y1, int x1, int y2, int x2);
 extern bool projectable(int y1, int x1, int y2, int x2);
-extern void scatter(int *yp, int *xp, int y, int x, int d, int mode);
+extern void scatter(POSITION *yp, POSITION *xp, POSITION y, POSITION x, POSITION d, int mode);
 extern void health_track(int m_idx);
 extern void monster_race_track(int r_idx);
 extern void object_kind_track(int k_idx);

diff --git a/src/melee2.c b/src/melee2.c
index 016004a..30ef47b 100644 (file)
--- a/src/melee2.c
+++ b/src/melee2.c
@@ -1505,8 +1505,8 @@ static bool monst_attack_monst(int m_idx, int t_idx)
        {
                bool obvious = FALSE;
 
-               int power = 0;
-               int damage = 0;
+               HIT_POINT power = 0;
+               HIT_POINT damage = 0;
 
                cptr act = NULL;
 

diff --git a/src/mind.c b/src/mind.c
index 037d090..18c559c 100644 (file)
--- a/src/mind.c
+++ b/src/mind.c
@@ -1404,136 +1404,136 @@ static bool cast_mirror_spell(int spell)
        int             plev = p_ptr->lev;
        int             tmp;
        TIME_EFFECT t;
-       int             x,y;
+       int             x, y;
 
        /* spell code */
        switch (spell)
        {
-       /* mirror of seeing */
+               /* mirror of seeing */
        case 0:
-         tmp = is_mirror_grid(&cave[p_ptr->y][p_ptr->x]) ? 4 : 0;
-         if( plev + tmp > 4)detect_monsters_normal(DETECT_RAD_DEFAULT);
-         if( plev + tmp > 18 )detect_monsters_invis(DETECT_RAD_DEFAULT);
-         if( plev + tmp > 28 )set_tim_esp((TIME_EFFECT)plev, FALSE);
-         if( plev + tmp > 38 )map_area(DETECT_RAD_MAP);
-         if( tmp == 0 && plev < 5 ){
-           msg_print(_("鏡がなくて集中できなかった！", "You need a mirror to concentrate!"));
-         }
-         break;
-       /* drip of light */
+               tmp = is_mirror_grid(&cave[p_ptr->y][p_ptr->x]) ? 4 : 0;
+               if (plev + tmp > 4)detect_monsters_normal(DETECT_RAD_DEFAULT);
+               if (plev + tmp > 18)detect_monsters_invis(DETECT_RAD_DEFAULT);
+               if (plev + tmp > 28)set_tim_esp((TIME_EFFECT)plev, FALSE);
+               if (plev + tmp > 38)map_area(DETECT_RAD_MAP);
+               if (tmp == 0 && plev < 5) {
+                       msg_print(_("鏡がなくて集中できなかった！", "You need a mirror to concentrate!"));
+               }
+               break;
+               /* drip of light */
        case 1:
-         if( number_of_mirrors() < 4 + plev/10 ){
-           place_mirror();
-         }
-         else {
+               if (number_of_mirrors() < 4 + plev / 10) {
+                       place_mirror();
+               }
+               else {
                        msg_format(_("これ以上鏡は制御できない！", "There are too many mirrors to control!"));
-         }
-         break;
+               }
+               break;
        case 2:
-         if (!get_aim_dir(&dir)) return FALSE;
-         if ( plev > 9 && is_mirror_grid(&cave[p_ptr->y][p_ptr->x]) ) {
-           fire_beam(GF_LITE, dir,damroll(3+((plev-1)/5),4));
-         }
-         else {
-           fire_bolt(GF_LITE, dir,damroll(3+((plev-1)/5),4));
-         }
-         break;
-       /* warped mirror */
+               if (!get_aim_dir(&dir)) return FALSE;
+               if (plev > 9 && is_mirror_grid(&cave[p_ptr->y][p_ptr->x])) {
+                       fire_beam(GF_LITE, dir, damroll(3 + ((plev - 1) / 5), 4));
+               }
+               else {
+                       fire_bolt(GF_LITE, dir, damroll(3 + ((plev - 1) / 5), 4));
+               }
+               break;
+               /* warped mirror */
        case 3:
-         teleport_player(10, 0L);
-         break;
-       /* mirror of light */
+               teleport_player(10, 0L);
+               break;
+               /* mirror of light */
        case 4:
-         (void)lite_area(damroll(2, (plev / 2)), (plev / 10) + 1);
-         break;
-       /* mirror of wandering */
+               (void)lite_area(damroll(2, (plev / 2)), (plev / 10) + 1);
+               break;
+               /* mirror of wandering */
        case 5:
-         teleport_player(plev * 5, 0L);
-         break;
-       /* robe of dust */
+               teleport_player(plev * 5, 0L);
+               break;
+               /* robe of dust */
        case 6:
-         set_dustrobe(20+randint1(20),FALSE);
-         break;
-       /* banishing mirror */
+               set_dustrobe(20 + randint1(20), FALSE);
+               break;
+               /* banishing mirror */
        case 7:
-         if (!get_aim_dir(&dir)) return FALSE;
-         (void)fire_beam(GF_AWAY_ALL, dir , plev);
-         break;
-       /* mirror clashing */
+               if (!get_aim_dir(&dir)) return FALSE;
+               (void)fire_beam(GF_AWAY_ALL, dir, plev);
+               break;
+               /* mirror clashing */
        case 8:
-         if (!get_aim_dir(&dir)) return FALSE;
-         fire_ball(GF_SHARDS, dir, damroll(8 + ((plev - 5) / 4), 8),
-                   (plev > 20 ? (plev - 20) / 8 + 1 : 0));
-         break;
-       /* mirror sleeping */
+               if (!get_aim_dir(&dir)) return FALSE;
+               fire_ball(GF_SHARDS, dir, damroll(8 + ((plev - 5) / 4), 8),
+                       (plev > 20 ? (plev - 20) / 8 + 1 : 0));
+               break;
+               /* mirror sleeping */
        case 9:
-         for(x=0;x<cur_wid;x++){
-           for(y=0;y<cur_hgt;y++){
-             if (is_mirror_grid(&cave[y][x])) {
-               project(0,2,y,x,plev,GF_OLD_SLEEP,(PROJECT_GRID|PROJECT_ITEM|PROJECT_KILL|PROJECT_JUMP|PROJECT_NO_HANGEKI),-1);
-             }
-           }
-         }
-         break;
-       /* seeker ray */
+               for (x = 0; x < cur_wid; x++) {
+                       for (y = 0; y < cur_hgt; y++) {
+                               if (is_mirror_grid(&cave[y][x])) {
+                                       project(0, 2, y, x, plev, GF_OLD_SLEEP, (PROJECT_GRID | PROJECT_ITEM | PROJECT_KILL | PROJECT_JUMP | PROJECT_NO_HANGEKI), -1);
+                               }
+                       }
+               }
+               break;
+               /* seeker ray */
        case 10:
-         if (!get_aim_dir(&dir)) return FALSE;
-         fire_beam(GF_SEEKER,dir, damroll(11+(plev-5)/4,8));
-         break;
-       /* seal of mirror */
+               if (!get_aim_dir(&dir)) return FALSE;
+               fire_beam(GF_SEEKER, dir, damroll(11 + (plev - 5) / 4, 8));
+               break;
+               /* seal of mirror */
        case 11:
-         seal_of_mirror(plev*4+100);
-         break;
-       /* shield of water */
+               seal_of_mirror(plev * 4 + 100);
+               break;
+               /* shield of water */
        case 12:
-         t = 20 + randint1(20);
-         set_shield(t, FALSE);
-         if( plev > 31 )set_tim_reflect(t, FALSE);
-         if( plev > 39 )set_resist_magic(t, FALSE);
-         break;
-       /* super ray */
+               t = 20 + randint1(20);
+               set_shield(t, FALSE);
+               if (plev > 31)set_tim_reflect(t, FALSE);
+               if (plev > 39)set_resist_magic(t, FALSE);
+               break;
+               /* super ray */
        case 13:
-         if (!get_aim_dir(&dir)) return FALSE;
-         fire_beam(GF_SUPER_RAY,dir, 150+randint1(2*plev));
-         break;
-       /* illusion light */
+               if (!get_aim_dir(&dir)) return FALSE;
+               fire_beam(GF_SUPER_RAY, dir, 150 + randint1(2 * plev));
+               break;
+               /* illusion light */
        case 14:
-         tmp = is_mirror_grid(&cave[p_ptr->y][p_ptr->x]) ? 4 : 3;
-         slow_monsters(plev);
-         stun_monsters(plev*tmp);
-         confuse_monsters(plev*tmp);
-         turn_monsters(plev*tmp);
-         stun_monsters(plev*tmp);
-         stasis_monsters(plev*tmp);
-         break;
-       /* mirror shift */
+               tmp = is_mirror_grid(&cave[p_ptr->y][p_ptr->x]) ? 4 : 3;
+               slow_monsters(plev);
+               stun_monsters(plev*tmp);
+               confuse_monsters(plev*tmp);
+               turn_monsters(plev*tmp);
+               stun_monsters(plev*tmp);
+               stasis_monsters(plev*tmp);
+               break;
+               /* mirror shift */
        case 15:
-         if( !is_mirror_grid(&cave[p_ptr->y][p_ptr->x]) ){
-               msg_print(_("鏡の国の場所がわからない！", "You cannot find out where is the world of mirror!"));
+               if (!is_mirror_grid(&cave[p_ptr->y][p_ptr->x])) {
+                       msg_print(_("鏡の国の場所がわからない！", "You cannot find out where is the world of mirror!"));
+                       break;
+               }
+               alter_reality();
                break;
-         }
-         alter_reality();
-         break;
-       /* mirror tunnel */
+               /* mirror tunnel */
        case 16:
-         msg_print(_("鏡の世界を通り抜け…  ", "Go through the world of mirror..."));
-         return mirror_tunnel();
+               msg_print(_("鏡の世界を通り抜け…  ", "Go through the world of mirror..."));
+               return mirror_tunnel();
 
-       /* mirror of recall */
+               /* mirror of recall */
        case 17:
                return word_of_recall();
-       /* multi-shadow */
+               /* multi-shadow */
        case 18:
-         set_multishadow(6+randint1(6),FALSE);
-         break;
-       /* binding field */
+               set_multishadow(6 + randint1(6), FALSE);
+               break;
+               /* binding field */
        case 19:
-         if( !binding_field(plev*11+5) )msg_print(_("適当な鏡を選べなかった！", "You were not able to choose suitable mirrors!"));
-         break;
-       /* mirror of Ruffnor */
+               if (!binding_field(plev * 11 + 5))msg_print(_("適当な鏡を選べなかった！", "You were not able to choose suitable mirrors!"));
+               break;
+               /* mirror of Ruffnor */
        case 20:
-         (void)set_invuln(randint1(4)+4,FALSE);
-         break;
+               (void)set_invuln(randint1(4) + 4, FALSE);
+               break;
        default:
                msg_print(_("なに？", "Zap?"));
 

diff --git a/src/types.h b/src/types.h
index 4110c4b..a8cc7ef 100644 (file)
--- a/src/types.h
+++ b/src/types.h
@@ -581,8 +581,8 @@ typedef struct monster_type monster_type;
 
 struct monster_type
 {
-       s16b r_idx;             /* Monster race index */
-       s16b ap_r_idx;          /* Monster race appearance index */
+       IDX r_idx;              /* Monster race index */
+       IDX ap_r_idx;           /* Monster race appearance index */
        byte sub_align;         /* Sub-alignment for a neutral monster */
 
        POSITION fy;            /* Y location on map */
@@ -593,7 +593,7 @@ struct monster_type
        HIT_POINT max_maxhp;            /* Max Max Hit points */
        u32b dealt_damage;              /* Sum of damages dealt by player */
 
-       s16b mtimed[MAX_MTIMED];        /* Timed status counter */
+       TIME_EFFECT mtimed[MAX_MTIMED]; /* Timed status counter */
 
        byte mspeed;            /* Monster "speed" */
        ACTION_ENERGY energy_need;      /* Monster "energy" */
@@ -607,8 +607,8 @@ struct monster_type
 
        IDX hold_o_idx; /* Object being held (if any) */
 
-       s16b target_y;          /* Can attack !los player */
-       s16b target_x;          /* Can attack !los player */
+       POSITION target_y;              /* Can attack !los player */
+       POSITION target_x;              /* Can attack !los player */
 
        u16b nickname;          /* Monster's Nickname */