| Revision | 5592a54c00781c61e23571bbc628836fc0e73095 (tree) |
|---|---|
| Time | 2019-07-22 23:39:27 |
| Author | deskull <deskull@user...> |
| Commiter | deskull |
[Refactor] #38997 do_cmd_bash() に player_type * 引数を追加．
src/cmd-basic.c (diff)
src/cmd-basic.h (diff) src/core.c (diff)| @@ -1741,17 +1741,17 @@ static bool do_cmd_bash_aux(POSITION y, POSITION x, DIRECTION dir) | ||
| 1741 | 1741 | * Creatures can also open or bash doors, see elsewhere. |
| 1742 | 1742 | * </pre> |
| 1743 | 1743 | */ |
| 1744 | -void do_cmd_bash(void) | |
| 1744 | +void do_cmd_bash(player_type *creature_ptr) | |
| 1745 | 1745 | { |
| 1746 | 1746 | int y, x, dir; |
| 1747 | 1747 | grid_type *g_ptr; |
| 1748 | 1748 | bool more = FALSE; |
| 1749 | 1749 | |
| 1750 | - if (p_ptr->wild_mode) return; | |
| 1750 | + if (creature_ptr->wild_mode) return; | |
| 1751 | 1751 | |
| 1752 | - if (p_ptr->special_defense & KATA_MUSOU) | |
| 1752 | + if (creature_ptr->special_defense & KATA_MUSOU) | |
| 1753 | 1753 | { |
| 1754 | - set_action(p_ptr, ACTION_NONE); | |
| 1754 | + set_action(creature_ptr, ACTION_NONE); | |
| 1755 | 1755 | } |
| 1756 | 1756 | |
| 1757 | 1757 | /* Allow repeated command */ |
| @@ -1759,7 +1759,7 @@ void do_cmd_bash(void) | ||
| 1759 | 1759 | { |
| 1760 | 1760 | /* Set repeat count */ |
| 1761 | 1761 | command_rep = command_arg - 1; |
| 1762 | - p_ptr->redraw |= (PR_STATE); | |
| 1762 | + creature_ptr->redraw |= (PR_STATE); | |
| 1763 | 1763 | |
| 1764 | 1764 | /* Cancel the arg */ |
| 1765 | 1765 | command_arg = 0; |
| @@ -1771,8 +1771,8 @@ void do_cmd_bash(void) | ||
| 1771 | 1771 | FEAT_IDX feat; |
| 1772 | 1772 | |
| 1773 | 1773 | /* Bash location */ |
| 1774 | - y = p_ptr->y + ddy[dir]; | |
| 1775 | - x = p_ptr->x + ddx[dir]; | |
| 1774 | + y = creature_ptr->y + ddy[dir]; | |
| 1775 | + x = creature_ptr->x + ddx[dir]; | |
| 1776 | 1776 | |
| 1777 | 1777 | g_ptr = ¤t_floor_ptr->grid_array[y][x]; |
| 1778 | 1778 |
| @@ -1788,7 +1788,7 @@ void do_cmd_bash(void) | ||
| 1788 | 1788 | /* Monster in the way */ |
| 1789 | 1789 | else if (g_ptr->m_idx) |
| 1790 | 1790 | { |
| 1791 | - take_turn(p_ptr, 100); | |
| 1791 | + take_turn(creature_ptr, 100); | |
| 1792 | 1792 | |
| 1793 | 1793 | msg_print(_("モンスターが立ちふさがっている！", "There is a monster in the way!")); |
| 1794 | 1794 |
| @@ -16,7 +16,7 @@ extern void do_cmd_open(player_type *creature_ptr); | ||
| 16 | 16 | extern void do_cmd_close(player_type *creature_ptr); |
| 17 | 17 | extern void do_cmd_tunnel(player_type *creature_ptr); |
| 18 | 18 | extern void do_cmd_disarm(player_type *creature_ptr); |
| 19 | -extern void do_cmd_bash(void); | |
| 19 | +extern void do_cmd_bash(player_type *creature_ptr); | |
| 20 | 20 | extern void do_cmd_alter(void); |
| 21 | 21 | extern void do_cmd_spike(player_type *creature_ptr); |
| 22 | 22 | extern void do_cmd_walk(bool pickup); |
| @@ -3800,7 +3800,7 @@ static void process_command(void) | ||
| 3800 | 3800 | /* Bash a door */ |
| 3801 | 3801 | case 'B': |
| 3802 | 3802 | { |
| 3803 | - do_cmd_bash(); | |
| 3803 | + do_cmd_bash(p_ptr); | |
| 3804 | 3804 | break; |
| 3805 | 3805 | } |
| 3806 | 3806 |
Fork