• R/O
  • HTTP
  • SSH
  • HTTPS

hengband: Commit

変愚蛮怒のメインリポジトリです


Commit MetaInfo

Revision1ec0f1acf50b40085523d50db72a3ca752f8bab4 (tree)
Time2019-07-23 10:08:32
Authordeskull <deskull@user...>
Commiterdeskull

Log Message

[Refactor] #39321 do_cmd_disarm_aux() を exe_disarm() に改名.

Change Summary

Incremental Difference

--- a/src/cmd-basic.c
+++ b/src/cmd-basic.c
@@ -1466,7 +1466,7 @@ static bool do_cmd_disarm_chest(POSITION y, POSITION x, OBJECT_IDX o_idx)
14661466 * </pre>
14671467 */
14681468
1469-bool do_cmd_disarm_aux(player_type *creature_ptr, POSITION y, POSITION x, DIRECTION dir)
1469+bool exe_disarm(player_type *creature_ptr, POSITION y, POSITION x, DIRECTION dir)
14701470 {
14711471 grid_type *g_ptr = &current_floor_ptr->grid_array[y][x];
14721472
@@ -1625,7 +1625,7 @@ void do_cmd_disarm(player_type *creature_ptr)
16251625 /* Disarm trap */
16261626 else
16271627 {
1628- more = do_cmd_disarm_aux(creature_ptr, y, x, dir);
1628+ more = exe_disarm(creature_ptr, y, x, dir);
16291629 }
16301630 }
16311631
@@ -1897,7 +1897,7 @@ void do_cmd_alter(void)
18971897 /* Disarm traps */
18981898 else if (have_flag(f_ptr->flags, FF_DISARM))
18991899 {
1900- more = do_cmd_disarm_aux(p_ptr, y, x, dir);
1900+ more = exe_disarm(p_ptr, y, x, dir);
19011901 }
19021902
19031903 else
--- a/src/cmd-basic.h
+++ b/src/cmd-basic.h
@@ -27,6 +27,6 @@ extern void do_cmd_fire(player_type *creature_ptr, SPELL_IDX snipe_type);
2727 extern void exe_fire(INVENTORY_IDX item, object_type *j_ptr, SPELL_IDX snipe_type);
2828 extern bool do_cmd_throw(int mult, bool boomerang, OBJECT_IDX shuriken);
2929 extern bool easy_open_door(player_type *creature_ptr, POSITION y, POSITION x);
30-extern bool do_cmd_disarm_aux(player_type *creature_ptr, POSITION y, POSITION x, DIRECTION dir);
30+extern bool exe_disarm(player_type *creature_ptr, POSITION y, POSITION x, DIRECTION dir);
3131
3232 extern void kamaenaoshi(INVENTORY_IDX item);
--- a/src/player-move.c
+++ b/src/player-move.c
@@ -1142,7 +1142,7 @@ void move_player(player_type *creature_ptr, DIRECTION dir, bool do_pickup, bool
11421142 {
11431143 if (!trap_can_be_ignored(p_ptr, g_ptr->feat))
11441144 {
1145- (void)do_cmd_disarm_aux(creature_ptr, y, x, dir);
1145+ (void)exe_disarm(creature_ptr, y, x, dir);
11461146 return;
11471147 }
11481148 }
Show on old repository browser