From: deskull <deskull@users.sourceforge.jp>
Date: Tue, 11 Feb 2020 06:15:11 +0000 (+0900)
Subject: [Refactor] #37353 歌唱状態の判定関数とマクロを player-status.c/h へ移動． / Move macros and functions... 
X-Git-Tag: vmacos3.0.0-alpha52~1672^2~1
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=391aca75b796fe91ebdcd56d9224b17e0724ff88;p=hengbandforosx%2Fhengbandosx.git

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

diff --git a/src/player-status.c b/src/player-status.c
index 0848baddc..62fa10fd8 100644
--- 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 672d9e961..49d6b394b 100644
--- 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 d7f83cbb2..0190d810c 100644
--- 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 0056154f0..d016d4d24 100644
--- 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);