[Refactor] #39970 Reshaped world-movement-processor.c

[hengband/hengband.git] / src / player-status.h

diff --git a/src/player-status.h b/src/player-status.h
index 672d9e9..8e9160c 100644 (file)
--- a/src/player-status.h
+++ b/src/player-status.h
@@ -1,5 +1,5 @@
 #pragma once 
-#include "bldg.h"
+#include "market/building.h"
 struct floor_type;
 typedef struct floor_type floor_type;
 
@@ -83,10 +83,9 @@ extern const byte adj_chr_chm[];
 extern const concptr stat_names[6];
 extern const concptr stat_names_reduced[6];
 
-typedef struct player_type player_type;
 struct floor_type;
 
-struct player_type
+typedef struct player_type
 {
        int player_uid;
        int player_euid;
@@ -761,8 +760,8 @@ struct player_type
        POSITION x;     /* Player location in dungeon */
        GAME_TEXT name[32]; /*!< 現在のプレイヤー名 / Current player's character name */
        char base_name[32]; /*!< Stripped version of "player_name" */
+} player_type;
 
-};
 extern player_type *p_ptr;
 
 extern concptr your_alignment(player_type *creature_ptr);
@@ -840,3 +839,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])