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

diff --git a/src/cmd-activate.c b/src/cmd-activate.c
index 9df9853..1d2e896 100644 (file)
--- a/src/cmd-activate.c
+++ b/src/cmd-activate.c
@@ -372,8 +372,7 @@ void do_cmd_activate_aux(int item)
 void do_cmd_activate(void)
 {
        OBJECT_IDX item;
-       cptr    q, s;
-
+       cptr q, s;
 
        if (p_ptr->special_defense & (KATA_MUSOU | KATA_KOUKIJIN))
        {
@@ -778,9 +777,7 @@ bool activate_artifact(object_type *o_ptr)
                        while (attempts--)
                        {
                                scatter(&y, &x, p_ptr->y, p_ptr->x, 4, 0);
-
                                if (!cave_have_flag_bold(y, x, FF_PROJECT)) continue;
-
                                if (!player_bold(y, x)) break;
                        }
 
@@ -819,6 +816,7 @@ bool activate_artifact(object_type *o_ptr)
                }
                break;
        }
+
        case ACT_BR_COLD:
        {
                if (!get_aim_dir(&dir)) return FALSE;
@@ -829,6 +827,7 @@ bool activate_artifact(object_type *o_ptr)
                }
                break;
        }
+
        case ACT_BR_DRAGON:
        {
                if (!activate_dragon_breath(o_ptr)) return FALSE;
@@ -836,7 +835,6 @@ bool activate_artifact(object_type *o_ptr)
        }
 
        /* Activate for other offensive action */
-
        case ACT_CONFUSE:
        {
                msg_print(_("様々な色の火花を発している...", "It glows in scintillating colours..."));

diff --git a/src/externs.h b/src/externs.h
index 87f883a..d0d5f8e 100644 (file)
--- a/src/externs.h
+++ b/src/externs.h
@@ -1538,7 +1538,7 @@ extern bool spell_is_inate(SPELL_IDX spell);
 extern bool make_attack_spell(MONSTER_IDX m_idx);
 extern void beam(MONSTER_IDX m_idx, int y, int x, int typ, int dam_hp, int monspell, int target_type);
 extern void bolt(MONSTER_IDX m_idx, int y, int x, int typ, int dam_hp, int monspell, int target_type);
-extern void breath(int y, int x, MONSTER_IDX m_idx, int typ, int dam_hp, int rad, bool breath, int monspell, int target_type);
+extern void breath(POSITION y, POSITION x, MONSTER_IDX m_idx, int typ, int dam_hp, POSITION rad, bool breath, int monspell, int target_type);
 
 /* mspells2.c */
 extern void get_project_point(int sy, int sx, int *ty, int *tx, BIT_FLAGS flg);
@@ -1558,9 +1558,7 @@ extern HIT_POINT monspell_race_damage(int SPELL_NUM, MONRACE_IDX r_idx, int TYPE
 extern HIT_POINT monspell_bluemage_damage(int SPELL_NUM, int plev, int TYPE);
 
 /* hissatsu.c */
-extern void hissatsu_info(char *p, int power);
 extern void do_cmd_hissatsu(void);
-extern void do_cmd_hissatsu_browse(void);
 extern void do_cmd_gain_hissatsu(void);
 extern MULTIPLY mult_hissatsu(MULTIPLY mult, BIT_FLAGS *flgs, monster_type *m_ptr, BIT_FLAGS mode);
 

diff --git a/src/mspells1.c b/src/mspells1.c
index 4db609b..c1cc2c4 100644 (file)
--- a/src/mspells1.c
+++ b/src/mspells1.c
@@ -569,12 +569,12 @@ void beam(MONSTER_IDX m_idx, int y, int x, int typ, int dam_hp, int monspell, in
  * @param typ 効果属性ID
  * @param dam_hp 威力
  * @param rad 半径
- * @param breath TRUEならばブ・E構萢・．ALSEならばボー・E萢
+ * @param breath 
  * @param monspell モンスター魔法のID
  * @param target_type モンスターからモンスターへ撃つならMONSTER_TO_MONSTER、モンスターからプレイヤーならMONSTER_TO_PLAYER
  * @return なし
  */
-void breath(int y, int x, MONSTER_IDX m_idx, int typ, int dam_hp, int rad, bool breath, int monspell, int target_type)
+void breath(POSITION y, POSITION x, MONSTER_IDX m_idx, int typ, int dam_hp, POSITION rad, bool breath, int monspell, int target_type)
 {
     monster_type *m_ptr = &m_list[m_idx];
     monster_race *r_ptr = &r_info[m_ptr->r_idx];