[Refactor] #37353 stop_singing() を player-status.c/h へ移動． / Move stop_singing() to...

diff --git a/src/cmd/cmd-basic.c b/src/cmd/cmd-basic.c
index dc3c76c..4a80e66 100644 (file)
--- a/src/cmd/cmd-basic.c
+++ b/src/cmd/cmd-basic.c
@@ -11,7 +11,6 @@
  */
 
 #include "angband.h"
-#include "util.h"
 #include "core.h"
 #include "term.h"
 
@@ -19,12 +18,8 @@
 #include "chest.h"
 #include "trap.h"
 #include "dungeon.h"
-#include "feature.h"
-#include "floor.h"
 #include "melee.h"
 #include "object-hook.h"
-#include "spells.h"
-#include "spells-summon.h"
 #include "spells-status.h"
 #include "monster.h"
 #include "monster-status.h"

diff --git a/src/player-status.c b/src/player-status.c
index e36f445..dfab803 100644 (file)
--- a/src/player-status.c
+++ b/src/player-status.c
@@ -5372,3 +5372,36 @@ bool can_two_hands_wielding(player_type *creature_ptr)
 {
        return !creature_ptr->riding || (creature_ptr->pet_extra_flags & PF_TWO_HANDS);
 }
+
+
+
+/*!
+* @brief 歌の停止を処理する / Stop singing if the player is a Bard
+* @return なし
+*/
+void stop_singing(player_type *creature_ptr)
+{
+       if (creature_ptr->pclass != CLASS_BARD) return;
+
+       /* Are there interupted song? */
+       if (INTERUPTING_SONG_EFFECT(creature_ptr))
+       {
+               /* Forget interupted song */
+               INTERUPTING_SONG_EFFECT(creature_ptr) = MUSIC_NONE;
+               return;
+       }
+
+       /* The player is singing? */
+       if (!SINGING_SONG_EFFECT(creature_ptr)) return;
+
+       /* Hack -- if called from set_action(), avoid recursive loop */
+       if (creature_ptr->action == ACTION_SING) set_action(creature_ptr, ACTION_NONE);
+
+       /* Message text of each song or etc. */
+       exe_spell(creature_ptr, REALM_MUSIC, SINGING_SONG_ID(creature_ptr), SPELL_STOP);
+
+       SINGING_SONG_EFFECT(creature_ptr) = MUSIC_NONE;
+       SINGING_SONG_ID(creature_ptr) = 0;
+       creature_ptr->update |= (PU_BONUS);
+       creature_ptr->redraw |= (PR_STATUS);
+}

diff --git a/src/player-status.h b/src/player-status.h
index 3486007..41d13ac 100644 (file)
--- a/src/player-status.h
+++ b/src/player-status.h
@@ -834,3 +834,5 @@ extern bool can_two_hands_wielding(player_type *creature_ptr);
 #define PY_REGEN_MNBASE         524     /* Min amount mana regen*2^16 */
 
 extern void cheat_death(player_type *creature_ptr);
+
+extern void stop_singing(player_type *creature_ptr);

diff --git a/src/spells-status.c b/src/spells-status.c
index 7557041..d5b12a9 100644 (file)
--- a/src/spells-status.c
+++ b/src/spells-status.c
@@ -172,38 +172,6 @@ bool fear_monster(player_type *caster_ptr, DIRECTION dir, PLAYER_LEVEL plev)
 }
 
 
-/*!
-* @brief 歌の停止を処理する / Stop singing if the player is a Bard
-* @return なし
-*/
-void stop_singing(player_type *creature_ptr)
-{
-       if (creature_ptr->pclass != CLASS_BARD) return;
-
-       /* Are there interupted song? */
-       if (INTERUPTING_SONG_EFFECT(creature_ptr))
-       {
-               /* Forget interupted song */
-               INTERUPTING_SONG_EFFECT(creature_ptr) = MUSIC_NONE;
-               return;
-       }
-
-       /* The player is singing? */
-       if (!SINGING_SONG_EFFECT(creature_ptr)) return;
-
-       /* Hack -- if called from set_action(), avoid recursive loop */
-       if (creature_ptr->action == ACTION_SING) set_action(creature_ptr, ACTION_NONE);
-
-       /* Message text of each song or etc. */
-       exe_spell(creature_ptr, REALM_MUSIC, SINGING_SONG_ID(creature_ptr), SPELL_STOP);
-
-       SINGING_SONG_EFFECT(creature_ptr) = MUSIC_NONE;
-       SINGING_SONG_ID(creature_ptr) = 0;
-       creature_ptr->update |= (PU_BONUS);
-       creature_ptr->redraw |= (PR_STATUS);
-}
-
-
 bool time_walk(player_type *creature_ptr)
 {
        if (creature_ptr->timewalk)

diff --git a/src/spells-status.h b/src/spells-status.h
index 5dd81f5..a7c4d81 100644 (file)
--- a/src/spells-status.h
+++ b/src/spells-status.h
@@ -10,7 +10,6 @@ extern bool stun_monster(player_type *caster_ptr, DIRECTION dir, PLAYER_LEVEL pl
 extern bool fear_monster(player_type *caster_ptr, DIRECTION dir, PLAYER_LEVEL plev);
 extern bool poly_monster(player_type *caster_ptr, DIRECTION dir, int power);
 extern bool clone_monster(player_type *caster_ptr, DIRECTION dir);
-extern void stop_singing(player_type *creature_ptr);
 extern bool time_walk(player_type *creature_ptr);
 extern void roll_hitdice(player_type *creature_ptr, SPOP_FLAGS options);
 extern bool_hack life_stream(player_type *creature_ptr, bool_hack message, bool_hack virtue_change);