From: deskull Date: Tue, 11 Feb 2020 05:29:39 +0000 (+0900) Subject: [Refactor] #37353 stop_mouth() を player-status.c/h へ移動. / Move stop_mouth() to player... X-Git-Url: http://git.osdn.net/view?p=hengband%2Fhengband.git;a=commitdiff_plain;h=aa312a8e8c83c0c15ae82f41f1134959edfa067d [Refactor] #37353 stop_mouth() を player-status.c/h へ移動. / Move stop_mouth() to player-status.c/h. --- diff --git a/src/player-status.c b/src/player-status.c index dfab80377..1988b8bfb 100644 --- a/src/player-status.c +++ b/src/player-status.c @@ -5405,3 +5405,14 @@ void stop_singing(player_type *creature_ptr) creature_ptr->update |= (PU_BONUS); creature_ptr->redraw |= (PR_STATUS); } + +/*! + * @brief 口を使う継続的な処理を中断する + * @param caster_ptr プレーヤーへの参照ポインタ + * @return なし + */ +void stop_mouth(player_type *caster_ptr) +{ + if (music_singing_any(caster_ptr)) stop_singing(caster_ptr); + if (hex_spelling_any(caster_ptr)) stop_hex_spell_all(caster_ptr); +} diff --git a/src/player-status.h b/src/player-status.h index 41d13ac88..4291aaa13 100644 --- a/src/player-status.h +++ b/src/player-status.h @@ -836,3 +836,4 @@ extern bool can_two_hands_wielding(player_type *creature_ptr); extern void cheat_death(player_type *creature_ptr); extern void stop_singing(player_type *creature_ptr); +extern void stop_mouth(player_type *caster_ptr); diff --git a/src/spells.h b/src/spells.h index 9f5b21544..c30176ac2 100644 --- a/src/spells.h +++ b/src/spells.h @@ -254,7 +254,6 @@ extern bool cast_wrath_of_the_god(player_type *caster_ptr, HIT_POINT dam, POSITI extern void cast_wonder(player_type *caster_ptr, DIRECTION dir); extern void cast_invoke_spirits(player_type *caster_ptr, DIRECTION dir); extern void cast_shuffle(player_type *caster_ptr); -extern void stop_mouth(player_type *caster_ptr); extern bool_hack vampirism(player_type *caster_ptr); extern bool hit_and_away(player_type *caster_ptr); extern bool psychometry(player_type *caster_ptr); diff --git a/src/spells2.c b/src/spells2.c index 0a2253203..d8cf42907 100644 --- a/src/spells2.c +++ b/src/spells2.c @@ -3828,18 +3828,6 @@ void cast_shuffle(player_type *caster_ptr) } -/*! - * @brief 口を使う継続的な処理を中断する - * @param caster_ptr プレーヤーへの参照ポインタ - * @return なし - */ -void stop_mouth(player_type *caster_ptr) -{ - if (music_singing_any(caster_ptr)) stop_singing(caster_ptr); - if (hex_spelling_any(caster_ptr)) stop_hex_spell_all(caster_ptr); -} - - bool_hack vampirism(player_type *caster_ptr) { if (d_info[caster_ptr->dungeon_idx].flags1 & DF1_NO_MELEE)