[Refactor] #37353 total_winner を world_type へ移動． / Move total_winner to world_type...

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

diff --git a/src/player-status.h b/src/player-status.h
index e43bc2e..87738d2 100644 (file)
--- a/src/player-status.h
+++ b/src/player-status.h
@@ -419,11 +419,8 @@ struct player_type
        concptr last_message;        /* Last message on death or retirement */
        char history[4][60];      /* Textual "history" for the Player */
 
-       u16b total_winner;        /* Total winner */
        u16b panic_save;          /* Panic save */
 
-       u16b noscore;             /* Cheating flags */
-
        bool wait_report_score;   /* Waiting to report score */
        bool is_dead;             /* Player is dead */
        bool now_damaged;
@@ -801,7 +798,7 @@ extern const s32b player_exp_a[PY_MAX_LEVEL];
 
 /* Temporary flags macro */
 #define IS_FAST(C) (C->fast || music_singing(C, MUSIC_SPEED) || music_singing(C, MUSIC_SHERO))
-#define IS_INVULN() (p_ptr->invuln || music_singing(p_ptr, MUSIC_INVULN))
+#define IS_INVULN(C) (C->invuln || music_singing(C, MUSIC_INVULN))
 #define IS_HERO() (p_ptr->hero || music_singing(p_ptr, MUSIC_HERO) || music_singing(p_ptr, MUSIC_SHERO))
 #define IS_BLESSED() (p_ptr->blessed || music_singing(p_ptr, MUSIC_BLESS) || hex_spelling(HEX_BLESS))
 #define IS_OPPOSE_ACID() (p_ptr->oppose_acid || music_singing(p_ptr, MUSIC_RESIST) || (p_ptr->special_defense & KATA_MUSOU))