変愚蛮怒のメインリポジトリです
Revision | 1ec0f1acf50b40085523d50db72a3ca752f8bab4 (tree) |
---|---|
Time | 2019-07-23 10:08:32 |
Author | deskull <deskull@user...> |
Commiter | deskull |
[Refactor] #39321 do_cmd_disarm_aux() を exe_disarm() に改名.
@@ -1466,7 +1466,7 @@ static bool do_cmd_disarm_chest(POSITION y, POSITION x, OBJECT_IDX o_idx) | ||
1466 | 1466 | * </pre> |
1467 | 1467 | */ |
1468 | 1468 | |
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) | |
1470 | 1470 | { |
1471 | 1471 | grid_type *g_ptr = ¤t_floor_ptr->grid_array[y][x]; |
1472 | 1472 |
@@ -1625,7 +1625,7 @@ void do_cmd_disarm(player_type *creature_ptr) | ||
1625 | 1625 | /* Disarm trap */ |
1626 | 1626 | else |
1627 | 1627 | { |
1628 | - more = do_cmd_disarm_aux(creature_ptr, y, x, dir); | |
1628 | + more = exe_disarm(creature_ptr, y, x, dir); | |
1629 | 1629 | } |
1630 | 1630 | } |
1631 | 1631 |
@@ -1897,7 +1897,7 @@ void do_cmd_alter(void) | ||
1897 | 1897 | /* Disarm traps */ |
1898 | 1898 | else if (have_flag(f_ptr->flags, FF_DISARM)) |
1899 | 1899 | { |
1900 | - more = do_cmd_disarm_aux(p_ptr, y, x, dir); | |
1900 | + more = exe_disarm(p_ptr, y, x, dir); | |
1901 | 1901 | } |
1902 | 1902 | |
1903 | 1903 | else |
@@ -27,6 +27,6 @@ extern void do_cmd_fire(player_type *creature_ptr, SPELL_IDX snipe_type); | ||
27 | 27 | extern void exe_fire(INVENTORY_IDX item, object_type *j_ptr, SPELL_IDX snipe_type); |
28 | 28 | extern bool do_cmd_throw(int mult, bool boomerang, OBJECT_IDX shuriken); |
29 | 29 | 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); | |
31 | 31 | |
32 | 32 | extern void kamaenaoshi(INVENTORY_IDX item); |
@@ -1142,7 +1142,7 @@ void move_player(player_type *creature_ptr, DIRECTION dir, bool do_pickup, bool | ||
1142 | 1142 | { |
1143 | 1143 | if (!trap_can_be_ignored(p_ptr, g_ptr->feat)) |
1144 | 1144 | { |
1145 | - (void)do_cmd_disarm_aux(creature_ptr, y, x, dir); | |
1145 | + (void)exe_disarm(creature_ptr, y, x, dir); | |
1146 | 1146 | return; |
1147 | 1147 | } |
1148 | 1148 | } |