From 318d95030b46f037fe0702368657cd1f564623ae Mon Sep 17 00:00:00 2001 From: Slimebreath6078 Date: Sat, 19 Feb 2022 10:03:06 +0900 Subject: [PATCH] =?utf8?q?[Fix]=20old=5Frace=5Fflags=5Fptr=E3=81=AB?= =?utf8?q?=E5=8B=95=E4=BD=9C=E5=8F=8A=E3=81=B3=E7=A8=AE=E6=97=8F=E3=83=95?= =?utf8?q?=E3=83=A9=E3=82=B0=E3=81=8C=E5=8F=8D=E6=98=A0=E3=81=95=E3=82=8C?= =?utf8?q?=E3=81=A6=E3=81=84=E3=81=AA=E3=81=84=E3=83=90=E3=82=B0=E3=82=92?= =?utf8?q?=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- src/monster/monster-processor-util.cpp | 3 +++ src/monster/monster-processor-util.h | 2 ++ src/monster/monster-update.cpp | 3 ++- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/monster/monster-processor-util.cpp b/src/monster/monster-processor-util.cpp index f302cdc14..0434bb2fe 100644 --- a/src/monster/monster-processor-util.cpp +++ b/src/monster/monster-processor-util.cpp @@ -47,6 +47,8 @@ old_race_flags *init_old_race_flags(old_race_flags *old_race_flags_ptr) old_race_flags_ptr->old_r_flags3 = 0L; old_race_flags_ptr->old_r_flagsr = 0L; old_race_flags_ptr->old_r_ability_flags.clear(); + old_race_flags_ptr->old_r_behavior_flags.clear(); + old_race_flags_ptr->old_r_kind_flags.clear(); old_race_flags_ptr->old_r_blows0 = 0; old_race_flags_ptr->old_r_blows1 = 0; @@ -291,6 +293,7 @@ void save_old_race_flags(MONRACE_IDX monster_race_idx, old_race_flags *old_race_ old_race_flags_ptr->old_r_flags3 = r_ptr->r_flags3; old_race_flags_ptr->old_r_flagsr = r_ptr->r_flagsr; 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_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 c29853272..9f148fff2 100644 --- a/src/monster/monster-processor-util.h +++ b/src/monster/monster-processor-util.h @@ -8,6 +8,7 @@ #include "monster-race/race-ability-flags.h" #include "monster-race/race-behavior-flags.h" +#include "monster-race/race-kind-flags.h" #include "system/angband.h" #include "util/flag-group.h" @@ -37,6 +38,7 @@ struct old_race_flags { BIT_FLAGS old_r_flagsr; EnumClassFlagGroup old_r_ability_flags; EnumClassFlagGroup old_r_behavior_flags; + EnumClassFlagGroup old_r_kind_flags; byte old_r_blows0; byte old_r_blows1; diff --git a/src/monster/monster-update.cpp b/src/monster/monster-update.cpp index 7122e9a9a..7d7280042 100644 --- a/src/monster/monster-update.cpp +++ b/src/monster/monster-update.cpp @@ -157,7 +157,8 @@ void update_player_window(PlayerType *player_ptr, old_race_flags *old_race_flags (old_race_flags_ptr->old_r_flags3 != r_ptr->r_flags3) || (old_race_flags_ptr->old_r_ability_flags != r_ptr->r_ability_flags) || (old_race_flags_ptr->old_r_flagsr != r_ptr->r_flagsr) || (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)) { + (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)) { player_ptr->window_flags |= PW_MONSTER; } } -- 2.11.0