[Refactor] #37353 コメント整理 / Refactor comments.

[hengband/hengband.git] / src / spells2.c

diff --git a/src/spells2.c b/src/spells2.c
index 4ab644d..94194fa 100644 (file)
--- a/src/spells2.c
+++ b/src/spells2.c
@@ -906,7 +906,7 @@ bool detect_all(POSITION range)
  * this is done in two passes. -- JDL
  * </pre>
  */
-bool project_hack(int typ, HIT_POINT dam)
+bool project_hack(EFFECT_ID typ, HIT_POINT dam)
 {
        int     i, x, y;
        int     flg = PROJECT_JUMP | PROJECT_KILL | PROJECT_HIDE;
@@ -1510,7 +1510,6 @@ bool probing(void)
        Term->scr->cv = cv;
        Term_fresh();
 
-       /* Done */
        if (probe)
        {
                chg_virtue(V_KNOWLEDGE, 1);
@@ -1632,7 +1631,7 @@ bool destroy_area(POSITION y1, POSITION x1, POSITION r, bool in_generate)
                        /* During generation, destroyed artifacts are "preserved" */
                        if (preserve_mode || in_generate)
                        {
-                               s16b this_o_idx, next_o_idx = 0;
+                               OBJECT_IDX this_o_idx, next_o_idx = 0;
 
                                /* Scan all objects in the grid */
                                for (this_o_idx = c_ptr->o_idx; this_o_idx; this_o_idx = next_o_idx)
@@ -1772,7 +1771,6 @@ bool destroy_area(POSITION y1, POSITION x1, POSITION r, bool in_generate)
                /* Hack -- Affect player */
                if (flag)
                {
-                       /* Message */
                        msg_print(_("燃えるような閃光が発生した！", "There is a searing blast of light!"));
 
                        /* Blind the player */
@@ -2114,7 +2112,6 @@ bool earthquake_aux(POSITION cy, POSITION cx, POSITION r, MONSTER_IDX m_idx)
                                        /* Delete (not kill) "dead" monsters */
                                        if (m_ptr->hp < 0)
                                        {
-                                               /* Message */
                                                if (!ignore_unview || is_seen(m_ptr)) 
                                                        msg_format(_("%^sは岩石に埋もれてしまった！", "%^s is embedded in the rock!"), m_name);
 
@@ -2797,7 +2794,7 @@ void unlite_room(POSITION y1, POSITION x1)
  * @param rad 効果半径
  * @return 作用が実際にあった場合TRUEを返す
  */
-bool lite_area(HIT_POINT dam, int rad)
+bool lite_area(HIT_POINT dam, POSITION rad)
 {
        BIT_FLAGS flg = PROJECT_GRID | PROJECT_KILL;
 
@@ -2830,7 +2827,7 @@ bool lite_area(HIT_POINT dam, int rad)
  * @param rad 効果半径
  * @return 作用が実際にあった場合TRUEを返す
  */
-bool unlite_area(HIT_POINT dam, int rad)
+bool unlite_area(HIT_POINT dam, POSITION rad)
 {
        BIT_FLAGS flg = PROJECT_GRID | PROJECT_KILL;
 
@@ -2866,9 +2863,9 @@ bool unlite_area(HIT_POINT dam, int rad)
  * Affect grids, objects, and monsters
  * </pre>
  */
-bool fire_ball(int typ, DIRECTION dir, HIT_POINT dam, int rad)
+bool fire_ball(EFFECT_ID typ, DIRECTION dir, HIT_POINT dam, POSITION rad)
 {
-       int tx, ty;
+       POSITION tx, ty;
 
        BIT_FLAGS flg = PROJECT_STOP | PROJECT_GRID | PROJECT_ITEM | PROJECT_KILL;
 
@@ -2903,7 +2900,7 @@ bool fire_ball(int typ, DIRECTION dir, HIT_POINT dam, int rad)
 * Affect grids, objects, and monsters
 * </pre>
 */
-bool fire_breath(int typ, DIRECTION dir, HIT_POINT dam, int rad)
+bool fire_breath(EFFECT_ID typ, DIRECTION dir, HIT_POINT dam, POSITION rad)
 {
        return fire_ball(typ, dir, dam, -rad);
 }
@@ -2923,7 +2920,7 @@ bool fire_breath(int typ, DIRECTION dir, HIT_POINT dam, int rad)
  * Affect grids, objects, and monsters
  * </pre>
  */
-bool fire_rocket(int typ, DIRECTION dir, HIT_POINT dam, int rad)
+bool fire_rocket(EFFECT_ID typ, DIRECTION dir, HIT_POINT dam, POSITION rad)
 {
        int tx, ty;
 
@@ -2959,7 +2956,7 @@ bool fire_rocket(int typ, DIRECTION dir, HIT_POINT dam, int rad)
  * Affect grids, objects, and monsters
  * </pre>
  */
-bool fire_ball_hide(int typ, DIRECTION dir, HIT_POINT dam, int rad)
+bool fire_ball_hide(EFFECT_ID typ, DIRECTION dir, HIT_POINT dam, POSITION rad)
 {
        int tx, ty;
 
@@ -3019,7 +3016,7 @@ bool fire_meteor(MONSTER_IDX who, EFFECT_ID typ, POSITION y, POSITION x, HIT_POI
  * @param dev 回数分散
  * @return 作用が実際にあった場合TRUEを返す
  */
-bool fire_blast(int typ, DIRECTION dir, int dd, int ds, int num, int dev)
+bool fire_blast(EFFECT_ID typ, DIRECTION dir, int dd, int ds, int num, int dev)
 {
        int ly, lx, ld;
        int ty, tx, y, x;
@@ -3079,10 +3076,10 @@ bool fire_blast(int typ, DIRECTION dir, int dd, int ds, int num, int dev)
  */
 bool teleport_swap(DIRECTION dir)
 {
-       int tx, ty;
-       cave_type * c_ptr;
-       monster_type * m_ptr;
-       monster_race * r_ptr;
+       POSITION tx, ty;
+       cave_type* c_ptr;
+       monster_type* m_ptr;
+       monster_race* r_ptr;
 
        if ((dir == 5) && target_okay())
        {
@@ -3151,7 +3148,7 @@ bool teleport_swap(DIRECTION dir)
  * @param flg フラグ
  * @return 作用が実際にあった場合TRUEを返す
  */
-bool project_hook(int typ, DIRECTION dir, HIT_POINT dam, BIT_FLAGS flg)
+bool project_hook(EFFECT_ID typ, DIRECTION dir, HIT_POINT dam, BIT_FLAGS flg)
 {
        int tx, ty;
 
@@ -3186,7 +3183,7 @@ bool project_hook(int typ, DIRECTION dir, HIT_POINT dam, BIT_FLAGS flg)
  * Affect monsters and grids (not objects).
  * </pre>
  */
-bool fire_bolt(int typ, DIRECTION dir, HIT_POINT dam)
+bool fire_bolt(EFFECT_ID typ, DIRECTION dir, HIT_POINT dam)
 {
        BIT_FLAGS flg = PROJECT_STOP | PROJECT_KILL | PROJECT_GRID;
        if (typ != GF_ARROW) flg |= PROJECT_REFLECTABLE;
@@ -3206,7 +3203,7 @@ bool fire_bolt(int typ, DIRECTION dir, HIT_POINT dam)
  * Affect monsters, grids and objects.
  * </pre>
  */
-bool fire_beam(int typ, DIRECTION dir, HIT_POINT dam)
+bool fire_beam(EFFECT_ID typ, DIRECTION dir, HIT_POINT dam)
 {
        BIT_FLAGS flg = PROJECT_BEAM | PROJECT_KILL | PROJECT_GRID | PROJECT_ITEM;
        return (project_hook(typ, dir, dam, flg));
@@ -3226,7 +3223,7 @@ bool fire_beam(int typ, DIRECTION dir, HIT_POINT dam)
  * Affect monsters, grids and objects.
  * </pre>
  */
-bool fire_bolt_or_beam(int prob, int typ, DIRECTION dir, HIT_POINT dam)
+bool fire_bolt_or_beam(PERCENTAGE prob, EFFECT_ID typ, DIRECTION dir, HIT_POINT dam)
 {
        if (randint0(100) < prob)
        {
@@ -3383,7 +3380,7 @@ bool stasis_evil(DIRECTION dir)
  * @param plev プレイヤーレベル(=効力)
  * @return 作用が実際にあった場合TRUEを返す
  */
-bool confuse_monster(DIRECTION dir, int plev)
+bool confuse_monster(DIRECTION dir, PLAYER_LEVEL plev)
 {
        BIT_FLAGS flg = PROJECT_STOP | PROJECT_KILL | PROJECT_REFLECTABLE;
        return (project_hook(GF_OLD_CONF, dir, plev, flg));
@@ -3395,7 +3392,7 @@ bool confuse_monster(DIRECTION dir, int plev)
  * @param plev プレイヤーレベル(=効力)
  * @return 作用が実際にあった場合TRUEを返す
  */
-bool stun_monster(DIRECTION dir, int plev)
+bool stun_monster(DIRECTION dir, PLAYER_LEVEL plev)
 {
        BIT_FLAGS flg = PROJECT_STOP | PROJECT_KILL | PROJECT_REFLECTABLE;
        return (project_hook(GF_STUN, dir, plev, flg));
@@ -3433,7 +3430,7 @@ bool clone_monster(DIRECTION dir)
  * @param plev プレイヤーレベル(=効力)
  * @return 作用が実際にあった場合TRUEを返す
  */
-bool fear_monster(DIRECTION dir, int plev)
+bool fear_monster(DIRECTION dir, PLAYER_LEVEL plev)
 {
        BIT_FLAGS flg = PROJECT_STOP | PROJECT_KILL | PROJECT_REFLECTABLE;
        return (project_hook(GF_TURN_ALL, dir, plev, flg));
@@ -3445,7 +3442,7 @@ bool fear_monster(DIRECTION dir, int plev)
  * @param plev プレイヤーレベル(効力はplev*200)
  * @return 作用が実際にあった場合TRUEを返す
  */
-bool death_ray(DIRECTION dir, int plev)
+bool death_ray(DIRECTION dir, PLAYER_LEVEL plev)
 {
        BIT_FLAGS flg = PROJECT_STOP | PROJECT_KILL | PROJECT_REFLECTABLE;
        return (project_hook(GF_DEATH_RAY, dir, plev * 200, flg));
@@ -3575,7 +3572,7 @@ bool animate_dead(MONSTER_IDX who, POSITION y, POSITION x)
 void call_chaos(void)
 {
        int Chaos_type, dummy, dir;
-       int plev = p_ptr->lev;
+       PLAYER_LEVEL plev = p_ptr->lev;
        bool line_chaos = FALSE;
 
        int hurt_types[31] =
@@ -4020,7 +4017,7 @@ bool deathray_monsters(void)
  * @param plev パワー
  * @return 作用が実際にあった場合TRUEを返す
  */
-bool charm_monster(DIRECTION dir, int plev)
+bool charm_monster(DIRECTION dir, PLAYER_LEVEL plev)
 {
        BIT_FLAGS flg = PROJECT_STOP | PROJECT_KILL;
        return (project_hook(GF_CHARM, dir, plev, flg));
@@ -4032,7 +4029,7 @@ bool charm_monster(DIRECTION dir, int plev)
  * @param plev パワー
  * @return 作用が実際にあった場合TRUEを返す
  */
-bool control_one_undead(DIRECTION dir, int plev)
+bool control_one_undead(DIRECTION dir, PLAYER_LEVEL plev)
 {
        BIT_FLAGS flg = PROJECT_STOP | PROJECT_KILL;
        return (project_hook(GF_CONTROL_UNDEAD, dir, plev, flg));
@@ -4044,7 +4041,7 @@ bool control_one_undead(DIRECTION dir, int plev)
  * @param plev パワー
  * @return 作用が実際にあった場合TRUEを返す
  */
-bool control_one_demon(DIRECTION dir, int plev)
+bool control_one_demon(DIRECTION dir, PLAYER_LEVEL plev)
 {
        BIT_FLAGS flg = PROJECT_STOP | PROJECT_KILL;
        return (project_hook(GF_CONTROL_DEMON, dir, plev, flg));
@@ -4056,7 +4053,7 @@ bool control_one_demon(DIRECTION dir, int plev)
  * @param plev パワー
  * @return 作用が実際にあった場合TRUEを返す
  */
-bool charm_animal(DIRECTION dir, int plev)
+bool charm_animal(DIRECTION dir, PLAYER_LEVEL plev)
 {
        BIT_FLAGS flg = PROJECT_STOP | PROJECT_KILL;
        return (project_hook(GF_CONTROL_ANIMAL, dir, plev, flg));
@@ -4072,7 +4069,7 @@ bool kawarimi(bool success)
 {
        object_type forge;
        object_type *q_ptr = &forge;
-       int y, x;
+       POSITION y, x;
 
        if (p_ptr->is_dead) return FALSE;
        if (p_ptr->confused || p_ptr->blind || p_ptr->paralyzed || p_ptr->image) return FALSE;
@@ -4271,7 +4268,6 @@ void ring_of_power(DIRECTION dir)
        case 1:
        case 2:
        {
-               /* Message */
                msg_print(_("あなたは悪性のオーラに包み込まれた。", "You are surrounded by a malignant aura."));
                sound(SOUND_EVIL);
 
@@ -4293,7 +4289,6 @@ void ring_of_power(DIRECTION dir)
 
        case 3:
        {
-               /* Message */
                msg_print(_("あなたは強力なオーラに包み込まれた。", "You are surrounded by a powerful aura."));
 
                /* Dispel monsters */
@@ -4437,7 +4432,7 @@ void wild_magic(int spell)
 * @param rad 効力の半径
 * @return なし
 */
-void cast_meteor(HIT_POINT dam, int rad)
+void cast_meteor(HIT_POINT dam, POSITION rad)
 {
        int i;
        int b = 10 + randint1(10);
@@ -4482,7 +4477,7 @@ void cast_meteor(HIT_POINT dam, int rad)
 * @param rad 効力の半径
 * @return ターゲットを指定し、実行したならばTRUEを返す。
 */
-bool cast_wrath_of_the_god(HIT_POINT dam, int rad)
+bool cast_wrath_of_the_god(HIT_POINT dam, POSITION rad)
 {
        POSITION x, y, tx, ty;
        POSITION nx, ny;
@@ -4578,7 +4573,7 @@ bool cast_wrath_of_the_god(HIT_POINT dam, int rad)
 */
 void cast_wonder(DIRECTION dir)
 {
-       int plev = p_ptr->lev;
+       PLAYER_LEVEL plev = p_ptr->lev;
        int die = randint1(100) + plev / 5;
        int vir = virtue_number(V_CHANCE);
 
@@ -4660,7 +4655,7 @@ void cast_wonder(DIRECTION dir)
 */
 void cast_invoke_spirits(DIRECTION dir)
 {
-       int plev = p_ptr->lev;
+       PLAYER_LEVEL plev = p_ptr->lev;
        int die = randint1(100) + plev / 5;
        int vir = virtue_number(V_CHANCE);
 
@@ -4808,7 +4803,7 @@ void cast_invoke_spirits(DIRECTION dir)
 */
 void cast_shuffle(void)
 {
-       int plev = p_ptr->lev;
+       PLAYER_LEVEL plev = p_ptr->lev;
        DIRECTION dir;
        int die;
        int vir = virtue_number(V_CHANCE);
@@ -5022,7 +5017,7 @@ bool_hack berserk(int base)
        return ident;
 }
 
-bool_hack cure_light_wounds(int dice, int sides)
+bool_hack cure_light_wounds(DICE_NUMBER dice, DICE_SID sides)
 {
        bool_hack ident = FALSE;
        if (hp_player(damroll(dice, sides))) ident = TRUE;
@@ -5032,7 +5027,7 @@ bool_hack cure_light_wounds(int dice, int sides)
        return ident;
 }
 
-bool_hack cure_serious_wounds(int dice, int sides)
+bool_hack cure_serious_wounds(DICE_NUMBER dice, DICE_SID sides)
 {
        bool_hack ident = FALSE;
        if (hp_player(damroll(dice, sides))) ident = TRUE;