[Refactor] #37353 do_cmd_fire_aux()をexe_fire()に改名。 / Rename do_cmd_fire_aux() to...

diff --git a/src/cmd-item.c b/src/cmd-item.c
index 56346a8..56b4bf4 100644 (file)
--- a/src/cmd-item.c
+++ b/src/cmd-item.c
@@ -1839,7 +1839,7 @@ void do_cmd_use(void)
                case TV_ARROW:
                case TV_BOLT:
                {
-                       do_cmd_fire_aux(item, &inventory[INVEN_BOW]);
+                       exe_fire(item, &inventory[INVEN_BOW]);
                        break;
                }
 

diff --git a/src/cmd2.c b/src/cmd2.c
index 6a7e2d0..b0c0467 100644 (file)
--- a/src/cmd2.c
+++ b/src/cmd2.c
@@ -2250,7 +2250,7 @@ void do_cmd_fire(void)
        }
 
        /* Fire the item */
-       do_cmd_fire_aux(item, j_ptr);
+       exe_fire(item, j_ptr);
 
        if (!is_fired || p_ptr->pclass != CLASS_SNIPER) return;
 

diff --git a/src/externs.h b/src/externs.h
index 6fb8842..17f251e 100644 (file)
--- a/src/externs.h
+++ b/src/externs.h
@@ -560,7 +560,7 @@ extern void do_cmd_stay(bool pickup);
 extern void do_cmd_run(void);
 extern void do_cmd_rest(void);
 extern void do_cmd_fire(void);
-extern void do_cmd_fire_aux(INVENTORY_IDX item, object_type *j_ptr);
+extern void exe_fire(INVENTORY_IDX item, object_type *j_ptr);
 extern bool do_cmd_throw(int mult, bool boomerang, OBJECT_IDX shuriken);
 #ifdef TRAVEL
 extern void do_cmd_travel(void);

diff --git a/src/shoot.c b/src/shoot.c
index 0ff5f9e..4e194c5 100644 (file)
--- a/src/shoot.c
+++ b/src/shoot.c
@@ -310,7 +310,7 @@ static s16b tot_dam_aux_shot(object_type *o_ptr, int tdam, monster_type *m_ptr)
 
 
 /*!
- * @brief 射撃処理のサブルーチン /
+ * @brief 射撃処理実行 /
  * Fire an object from the pack or floor.
  * @param item 射撃するオブジェクトの所持ID
  * @param j_ptr 射撃武器のオブジェクト参照ポインタ
@@ -333,7 +333,7 @@ static s16b tot_dam_aux_shot(object_type *o_ptr, int tdam, monster_type *m_ptr)
  * Note that Bows of "Extra Shots" give an extra shot.
  * </pre>
  */
-void do_cmd_fire_aux(INVENTORY_IDX item, object_type *j_ptr)
+void exe_fire(INVENTORY_IDX item, object_type *j_ptr)
 {
        DIRECTION dir;
        int i;