[Refactor] flags# を削除

diff --git a/src/lore/lore-calculator.cpp b/src/lore/lore-calculator.cpp
index 2a12099..f8eebca 100644 (file)
--- a/src/lore/lore-calculator.cpp
+++ b/src/lore/lore-calculator.cpp
@@ -159,9 +159,6 @@ void set_flags_for_full_knowledge(lore_type *lore_ptr)
         lore_ptr->drop_gold = 0;
     }
 
-    lore_ptr->flags1 = lore_ptr->r_ptr->flags1;
-    lore_ptr->flags2 = lore_ptr->r_ptr->flags2;
-    lore_ptr->flags3 = lore_ptr->r_ptr->flags3;
     lore_ptr->ability_flags = lore_ptr->r_ptr->ability_flags;
     lore_ptr->aura_flags = lore_ptr->r_ptr->aura_flags;
     lore_ptr->behavior_flags = lore_ptr->r_ptr->behavior_flags;

diff --git a/src/lore/lore-util.cpp b/src/lore/lore-util.cpp
index 6fc59a7..20e47ba 100644 (file)
--- a/src/lore/lore-util.cpp
+++ b/src/lore/lore-util.cpp
@@ -44,7 +44,6 @@ lore_type::lore_type(MonsterRaceId r_idx, monster_lore_mode mode)
     this->aura_flags = (this->r_ptr->aura_flags & this->r_ptr->r_aura_flags);
     this->behavior_flags = (this->r_ptr->behavior_flags & this->r_ptr->r_behavior_flags);
     this->drop_flags = (this->r_ptr->drop_flags & this->r_ptr->r_drop_flags);
-    this->flags7 = (this->r_ptr->flags7 & this->r_ptr->flags7);
     this->resistance_flags = (this->r_ptr->resistance_flags & this->r_ptr->r_resistance_flags);
     this->feature_flags = (this->r_ptr->feature_flags & this->r_ptr->r_feature_flags);
     this->brightness_flags = this->r_ptr->brightness_flags;

diff --git a/src/lore/lore-util.h b/src/lore/lore-util.h
index 01a1688..a437182 100644 (file)
--- a/src/lore/lore-util.h
+++ b/src/lore/lore-util.h
@@ -70,10 +70,6 @@ struct lore_type {
     byte speed;
     ITEM_NUMBER drop_gold;
     ITEM_NUMBER drop_item;
-    BIT_FLAGS flags1;
-    BIT_FLAGS flags2;
-    BIT_FLAGS flags3;
-    BIT_FLAGS flags7;
     EnumClassFlagGroup<MonsterAbilityType> ability_flags;
     EnumClassFlagGroup<MonsterAuraType> aura_flags;
     EnumClassFlagGroup<MonsterBehaviorType> behavior_flags;

diff --git a/src/monster/monster-util.cpp b/src/monster/monster-util.cpp
index 26906c4..f464b10 100644 (file)
--- a/src/monster/monster-util.cpp
+++ b/src/monster/monster-util.cpp
@@ -124,11 +124,6 @@ static bool restrict_monster_to_dungeon(const FloorType *floor_ptr, MonsterRaceI
     case DUNGEON_MODE_AND:
     case DUNGEON_MODE_NAND: {
         std::vector<bool> is_possible = {
-            all_bits(r_ptr->flags1, d_ptr->mflags1),
-            all_bits(r_ptr->flags2, d_ptr->mflags2),
-            all_bits(r_ptr->flags3, d_ptr->mflags3),
-            all_bits(r_ptr->flags7, d_ptr->mflags7),
-            all_bits(r_ptr->flags8, d_ptr->mflags8),
             is_possible_monster_and(r_ptr->ability_flags, d_ptr->mon_ability_flags),
             is_possible_monster_and(r_ptr->behavior_flags, d_ptr->mon_behavior_flags),
             is_possible_monster_and(r_ptr->resistance_flags, d_ptr->mon_resistance_flags),
@@ -151,11 +146,6 @@ static bool restrict_monster_to_dungeon(const FloorType *floor_ptr, MonsterRaceI
     case DUNGEON_MODE_OR:
     case DUNGEON_MODE_NOR: {
         std::vector<bool> is_possible = {
-            any_bits(r_ptr->flags1, d_ptr->mflags1),
-            any_bits(r_ptr->flags2, d_ptr->mflags2),
-            any_bits(r_ptr->flags3, d_ptr->mflags3),
-            any_bits(r_ptr->flags7, d_ptr->mflags7),
-            any_bits(r_ptr->flags8, d_ptr->mflags8),
             is_possible_monster_or(r_ptr->ability_flags, d_ptr->mon_ability_flags),
             is_possible_monster_or(r_ptr->behavior_flags, d_ptr->mon_behavior_flags),
             is_possible_monster_or(r_ptr->resistance_flags, d_ptr->mon_resistance_flags),

diff --git a/src/system/dungeon-info.h b/src/system/dungeon-info.h
index b090617..375ff7b 100644 (file)
--- a/src/system/dungeon-info.h
+++ b/src/system/dungeon-info.h
@@ -83,12 +83,6 @@ struct dungeon_type {
 
     EnumClassFlagGroup<DungeonFeatureType> flags{}; /* Dungeon Flags */
 
-    BIT_FLAGS mflags1{}; /* The monster flags that are allowed */
-    BIT_FLAGS mflags2{};
-    BIT_FLAGS mflags3{};
-    BIT_FLAGS mflags7{};
-    BIT_FLAGS mflags8{};
-
     EnumClassFlagGroup<MonsterAbilityType> mon_ability_flags;
     EnumClassFlagGroup<MonsterBehaviorType> mon_behavior_flags;
     EnumClassFlagGroup<MonsterVisualType> mon_visual_flags;

diff --git a/src/system/monster-race-info.h b/src/system/monster-race-info.h
index 896d02c..8e83a3a 100644 (file)
--- a/src/system/monster-race-info.h
+++ b/src/system/monster-race-info.h
@@ -79,11 +79,6 @@ public:
     EXP mexp{}; //!< 殺害時基本経験値 / Exp value for kill
     RARITY freq_spell{}; //!< 魔法＆特殊能力仕様頻度(1/n) /  Spell frequency
     MonsterSex sex{}; //!< 性別 / Sex
-    BIT_FLAGS flags1{}; //!< Flags 1 (general)
-    BIT_FLAGS flags2{}; //!< Flags 2 (abilities)
-    BIT_FLAGS flags3{}; //!< Flags 3 (race/resist)
-    BIT_FLAGS flags7{}; //!< Flags 7 (movement related abilities)
-    BIT_FLAGS flags8{}; //!< Flags 8 (wilderness info)
     EnumClassFlagGroup<MonsterAbilityType> ability_flags; //!< 能力フラグ(魔法/ブレス) / Ability Flags
     EnumClassFlagGroup<MonsterAuraType> aura_flags; //!< オーラフラグ / Aura Flags
     EnumClassFlagGroup<MonsterBehaviorType> behavior_flags; //!< 能力フラグ（習性）