[Fix] #41266 モンスター名が80バイトしか確保されていない箇所を全て160バイトに変更した (つもり、要チェック) / Changed from 80...

[hengband/hengband.git] / src / player / player-status-flags.c

diff --git a/src/player/player-status-flags.c b/src/player/player-status-flags.c
index da2164e..10a6307 100644 (file)
--- a/src/player/player-status-flags.c
+++ b/src/player/player-status-flags.c
@@ -947,10 +947,6 @@ void has_curses(player_type *creature_ptr)
 
     if (creature_ptr->cursed & TRC_TELEPORT)
         creature_ptr->cursed &= ~(TRC_TELEPORT_SELF);
-
-    if ((is_specific_player_race(creature_ptr, RACE_S_FAIRY)) && (creature_ptr->pseikaku != PERSONALITY_SEXY) && (creature_ptr->cursed & TRC_AGGRAVATE)) {
-        creature_ptr->cursed &= ~(TRC_AGGRAVATE);
-    }
 }
 
 BIT_FLAGS has_impact(player_type *creature_ptr)
@@ -1719,3 +1715,18 @@ bool has_not_monk_weapon(player_type *creature_ptr, int i)
 }
 
 bool has_good_luck(player_type *creature_ptr) { return (creature_ptr->pseikaku == PERSONALITY_LUCKY) || (creature_ptr->muta3 & MUT3_GOOD_LUCK); }
+
+BIT_FLAGS player_aggravate_state(player_type *creature_ptr)
+{
+    if (creature_ptr->cursed & TRC_AGGRAVATE) {
+        if ((is_specific_player_race(creature_ptr, RACE_S_FAIRY)) && (creature_ptr->pseikaku != PERSONALITY_SEXY)) {
+            return AGGRAVATE_S_FAIRY;
+        }
+        return AGGRAVATE_NORMAL;
+    }
+    
+    return AGGRAVATE_NONE; 
+}
+
+bool has_aggravate(player_type *creature_ptr) { return player_aggravate_state(creature_ptr) == AGGRAVATE_NORMAL; }
+