From f9b364885c29633bf0d9976388cc200a4232a536 Mon Sep 17 00:00:00 2001 From: Slimebreath6078 Date: Sun, 18 Feb 2024 23:10:40 +0900 Subject: [PATCH] =?utf8?q?[Refactor]=20r=5Fflags=5F#=20=E3=82=92=E5=89=8A?= =?utf8?q?=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- src/lore/lore-store.cpp | 15 --------------- src/lore/lore-util.cpp | 3 --- src/monster/monster-processor-util.cpp | 3 --- src/monster/monster-processor-util.h | 4 ---- src/monster/monster-update.cpp | 3 +-- src/system/monster-race-info.h | 3 --- 6 files changed, 1 insertion(+), 30 deletions(-) diff --git a/src/lore/lore-store.cpp b/src/lore/lore-store.cpp index d4421a609..3785ee810 100644 --- a/src/lore/lore-store.cpp +++ b/src/lore/lore-store.cpp @@ -78,18 +78,6 @@ int lore_do_probe(PlayerType *player_ptr, MonsterRaceId r_idx) } r_ptr->r_cast_spell = MAX_UCHAR; - for (int i = 0; i < 32; i++) { - if (!(r_ptr->r_flags1 & (1UL << i)) && (r_ptr->flags1 & (1UL << i))) { - n++; - } - if (!(r_ptr->r_flags2 & (1UL << i)) && (r_ptr->flags2 & (1UL << i))) { - n++; - } - if (!(r_ptr->r_flags3 & (1UL << i)) && (r_ptr->flags3 & (1UL << i))) { - n++; - } - } - n += count_lore_mflag_group(r_ptr->resistance_flags, r_ptr->r_resistance_flags); n += count_lore_mflag_group(r_ptr->ability_flags, r_ptr->r_ability_flags); n += count_lore_mflag_group(r_ptr->behavior_flags, r_ptr->r_behavior_flags); @@ -98,9 +86,6 @@ int lore_do_probe(PlayerType *player_ptr, MonsterRaceId r_idx) n += count_lore_mflag_group(r_ptr->special_flags, r_ptr->r_special_flags); n += count_lore_mflag_group(r_ptr->misc_flags, r_ptr->r_misc_flags); - r_ptr->r_flags1 = r_ptr->flags1; - r_ptr->r_flags2 = r_ptr->flags2; - r_ptr->r_flags3 = r_ptr->flags3; r_ptr->r_resistance_flags = r_ptr->resistance_flags; r_ptr->r_ability_flags = r_ptr->ability_flags; r_ptr->r_behavior_flags = r_ptr->behavior_flags; diff --git a/src/lore/lore-util.cpp b/src/lore/lore-util.cpp index 2605b561d..6fc59a770 100644 --- a/src/lore/lore-util.cpp +++ b/src/lore/lore-util.cpp @@ -40,9 +40,6 @@ lore_type::lore_type(MonsterRaceId r_idx, monster_lore_mode mode) this->speed = this->nightmare ? this->r_ptr->speed + 5 : this->r_ptr->speed; this->drop_gold = this->r_ptr->r_drop_gold; this->drop_item = this->r_ptr->r_drop_item; - this->flags1 = (this->r_ptr->flags1 & this->r_ptr->r_flags1); - this->flags2 = (this->r_ptr->flags2 & this->r_ptr->r_flags2); - this->flags3 = (this->r_ptr->flags3 & this->r_ptr->r_flags3); this->ability_flags = (this->r_ptr->ability_flags & this->r_ptr->r_ability_flags); 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); diff --git a/src/monster/monster-processor-util.cpp b/src/monster/monster-processor-util.cpp index 47cbdc5d0..3aacda9bd 100644 --- a/src/monster/monster-processor-util.cpp +++ b/src/monster/monster-processor-util.cpp @@ -266,9 +266,6 @@ old_race_flags::old_race_flags(MonsterRaceId monrace_id) const auto &monrace = monraces_info[monrace_id]; - this->old_r_flags1 = monrace.r_flags1; - this->old_r_flags2 = monrace.r_flags2; - this->old_r_flags3 = monrace.r_flags3; this->old_r_ability_flags = monrace.r_ability_flags; this->old_r_behavior_flags = monrace.r_behavior_flags; this->old_r_kind_flags = monrace.r_kind_flags; diff --git a/src/monster/monster-processor-util.h b/src/monster/monster-processor-util.h index 8ef8c0ed0..b31d41a7f 100644 --- a/src/monster/monster-processor-util.h +++ b/src/monster/monster-processor-util.h @@ -41,10 +41,6 @@ struct turn_flags { struct old_race_flags { old_race_flags(MonsterRaceId monrace_id); - BIT_FLAGS old_r_flags1 = 0; - BIT_FLAGS old_r_flags2 = 0; - BIT_FLAGS old_r_flags3 = 0; - BIT_FLAGS old_r_flagsr = 0; EnumClassFlagGroup old_r_ability_flags{}; EnumClassFlagGroup old_r_behavior_flags{}; EnumClassFlagGroup old_r_kind_flags{}; diff --git a/src/monster/monster-update.cpp b/src/monster/monster-update.cpp index bea13c2bd..5e214b716 100644 --- a/src/monster/monster-update.cpp +++ b/src/monster/monster-update.cpp @@ -183,8 +183,7 @@ void update_player_window(PlayerType *player_ptr, old_race_flags *old_race_flags { MonsterRaceInfo *r_ptr; r_ptr = &monraces_info[player_ptr->monster_race_idx]; - if ((old_race_flags_ptr->old_r_flags1 != r_ptr->r_flags1) || (old_race_flags_ptr->old_r_flags2 != r_ptr->r_flags2) || - (old_race_flags_ptr->old_r_flags3 != r_ptr->r_flags3) || (old_race_flags_ptr->old_r_ability_flags != r_ptr->r_ability_flags) || + if ((old_race_flags_ptr->old_r_ability_flags != r_ptr->r_ability_flags) || (old_race_flags_ptr->old_r_resistance_flags != r_ptr->r_resistance_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]) || (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) || diff --git a/src/system/monster-race-info.h b/src/system/monster-race-info.h index 8cc156de4..896d02c29 100644 --- a/src/system/monster-race-info.h +++ b/src/system/monster-race-info.h @@ -130,9 +130,6 @@ public: ITEM_NUMBER r_drop_item{}; //!< これまでに撃破時に落としたアイテムの数 / Max number of item dropped at once byte r_cast_spell{}; //!< 使った魔法/ブレスの種類数 / Max unique number of spells seen byte r_blows[MAX_NUM_BLOWS]{}; //!< 受けた打撃 / Number of times each blow type was seen - uint32_t r_flags1{}; //!< Observed racial flags - uint32_t r_flags2{}; //!< Observed racial flags - uint32_t r_flags3{}; //!< Observed racial flags EnumClassFlagGroup r_ability_flags; //!< 見た能力フラグ(魔法/ブレス) / Observed racial ability flags EnumClassFlagGroup r_aura_flags; //!< 見た能力フラグ(オーラ) / Observed aura flags EnumClassFlagGroup r_behavior_flags; //!< 見た能力フラグ（習性） / Observed racial attr flags -- 2.11.0