[Refactor] #37353 歌唱状態の判定関数とマクロを player-status.c/h へ移動． / Move macros and functions...

diff --git a/src/player-status.c b/src/player-status.c
index 0848bad..62fa10f 100644 (file)
--- a/src/player-status.c
+++ b/src/player-status.c
@@ -5474,3 +5474,8 @@ PERCENTAGE calculate_upkeep(player_type *creature_ptr)
        else
                return 0;
 }
+
+bool music_singing(player_type *caster_ptr, int music_songs)
+{
+       return (caster_ptr->pclass == CLASS_BARD) && (caster_ptr->magic_num1[0] == music_songs);
+}

diff --git a/src/player-status.h b/src/player-status.h
index 672d9e9..49d6b39 100644 (file)
--- a/src/player-status.h
+++ b/src/player-status.h
@@ -840,3 +840,10 @@ extern void cheat_death(player_type *creature_ptr);
 extern void stop_singing(player_type *creature_ptr);
 extern void stop_mouth(player_type *caster_ptr);
 extern PERCENTAGE calculate_upkeep(player_type *creature_ptr);
+extern bool music_singing(player_type *caster_ptr, int music_songs);
+
+#define SINGING_SONG_EFFECT(P_PTR) ((P_PTR)->magic_num1[0])
+#define INTERUPTING_SONG_EFFECT(P_PTR) ((P_PTR)->magic_num1[1])
+#define SINGING_COUNT(P_PTR) ((P_PTR)->magic_num1[2])
+#define SINGING_SONG_ID(P_PTR) ((P_PTR)->magic_num2[0])
+#define music_singing_any(CREATURE_PTR) (((CREATURE_PTR)->pclass == CLASS_BARD) && (CREATURE_PTR)->magic_num1[0])

diff --git a/src/realm-song.c b/src/realm-song.c
index d7f83cb..0190d81 100644 (file)
--- a/src/realm-song.c
+++ b/src/realm-song.c
@@ -936,8 +936,3 @@ concptr do_music_spell(player_type *caster_ptr, SPELL_IDX spell, BIT_FLAGS mode)
 
        return "";
 }
-
-bool music_singing(player_type *caster_ptr, int music_songs)
-{
-       return (caster_ptr->pclass == CLASS_BARD) && (caster_ptr->magic_num1[0] == music_songs);
-}

diff --git a/src/realm-song.h b/src/realm-song.h
index 0056154..d016d4d 100644 (file)
--- a/src/realm-song.h
+++ b/src/realm-song.h
@@ -29,11 +29,4 @@
 
 #define MUSIC_DETECT            101
 
-#define SINGING_SONG_EFFECT(P_PTR) ((P_PTR)->magic_num1[0])
-#define INTERUPTING_SONG_EFFECT(P_PTR) ((P_PTR)->magic_num1[1])
-#define SINGING_COUNT(P_PTR) ((P_PTR)->magic_num1[2])
-#define SINGING_SONG_ID(P_PTR) ((P_PTR)->magic_num2[0])
-#define music_singing_any(CREATURE_PTR) (((CREATURE_PTR)->pclass == CLASS_BARD) && (CREATURE_PTR)->magic_num1[0])
-
 extern concptr do_music_spell(player_type *caster_ptr, SPELL_IDX spell, BIT_FLAGS mode);
-extern bool music_singing(player_type *caster_ptr, int music_songs);