[Refactor] モンスターフラグの更新の定義に地形関連フラグを追加

diff --git a/src/monster/monster-processor-util.cpp b/src/monster/monster-processor-util.cpp
index 3ae6023..ebf0c9f 100644 (file)
--- a/src/monster/monster-processor-util.cpp
+++ b/src/monster/monster-processor-util.cpp
@@ -50,6 +50,7 @@ old_race_flags *init_old_race_flags(old_race_flags *old_race_flags_ptr)
     old_race_flags_ptr->old_r_behavior_flags.clear();
     old_race_flags_ptr->old_r_kind_flags.clear();
     old_race_flags_ptr->old_r_drop_flags.clear();
+    old_race_flags_ptr->old_r_feature_flags.clear();
 
     old_race_flags_ptr->old_r_blows0 = 0;
     old_race_flags_ptr->old_r_blows1 = 0;
@@ -300,6 +301,7 @@ void save_old_race_flags(MonsterRaceId monster_race_idx, old_race_flags *old_rac
     old_race_flags_ptr->old_r_ability_flags = r_ptr->r_ability_flags;
     old_race_flags_ptr->old_r_behavior_flags = r_ptr->r_behavior_flags;
     old_race_flags_ptr->old_r_drop_flags = r_ptr->r_drop_flags;
+    old_race_flags_ptr->old_r_feature_flags = r_ptr->r_feature_flags;
 
     old_race_flags_ptr->old_r_blows0 = r_ptr->r_blows[0];
     old_race_flags_ptr->old_r_blows1 = r_ptr->r_blows[1];

diff --git a/src/monster/monster-processor-util.h b/src/monster/monster-processor-util.h
index 3884608..63d35a8 100644 (file)
--- a/src/monster/monster-processor-util.h
+++ b/src/monster/monster-processor-util.h
@@ -9,6 +9,7 @@
 #include "monster-race/race-ability-flags.h"
 #include "monster-race/race-behavior-flags.h"
 #include "monster-race/race-drop-flags.h"
+#include "monster-race/race-feature-flags.h"
 #include "monster-race/race-flags-resistance.h"
 #include "monster-race/race-kind-flags.h"
 #include "system/angband.h"
@@ -45,6 +46,7 @@ struct old_race_flags {
     EnumClassFlagGroup<MonsterKindType> old_r_kind_flags;
     EnumClassFlagGroup<MonsterResistanceType> old_r_resistance_flags;
     EnumClassFlagGroup<MonsterDropType> old_r_drop_flags;
+    EnumClassFlagGroup<MonsterFeatureType> old_r_feature_flags;
 
     byte old_r_blows0;
     byte old_r_blows1;

diff --git a/src/monster/monster-update.cpp b/src/monster/monster-update.cpp
index cea48c1..fe0774a 100644 (file)
--- a/src/monster/monster-update.cpp
+++ b/src/monster/monster-update.cpp
@@ -170,7 +170,7 @@ void update_player_window(PlayerType *player_ptr, old_race_flags *old_race_flags
         (old_race_flags_ptr->old_r_blows1 != r_ptr->r_blows[1]) || (old_race_flags_ptr->old_r_blows2 != r_ptr->r_blows[2]) ||
         (old_race_flags_ptr->old_r_blows3 != r_ptr->r_blows[3]) || (old_race_flags_ptr->old_r_cast_spell != r_ptr->r_cast_spell) ||
         (old_race_flags_ptr->old_r_behavior_flags != r_ptr->r_behavior_flags) || (old_race_flags_ptr->old_r_kind_flags != r_ptr->r_kind_flags) ||
-        (old_race_flags_ptr->old_r_drop_flags != r_ptr->r_drop_flags)) {
+        (old_race_flags_ptr->old_r_drop_flags != r_ptr->r_drop_flags) || (old_race_flags_ptr->old_r_feature_flags != r_ptr->r_feature_flags)) {
         player_ptr->window_flags |= PW_MONSTER;
     }
 }