From fd127352be7b8e1695bc32f700517b02ee5b8dd6 Mon Sep 17 00:00:00 2001 From: deskull Date: Sat, 1 Jun 2019 17:36:13 +0900 Subject: [PATCH] =?utf8?q?[Refactor]=20#37353=20RFR=5F*=20=E8=80=90?= =?utf8?q?=E6=80=A7=E3=83=95=E3=83=A9=E3=82=B0=E3=81=BE=E3=81=A8=E3=82=81?= =?utf8?q?=E3=82=92=20monsterrace.h=20=E3=81=B8=E7=A7=BB=E5=8B=95=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- src/defines.h | 13 ------------- src/monsterrace.h | 11 +++++++++++ 2 files changed, 11 insertions(+), 13 deletions(-) diff --git a/src/defines.h b/src/defines.h index 65b5a219c..e6821f6ca 100644 --- a/src/defines.h +++ b/src/defines.h @@ -319,19 +319,6 @@ #define have_pval_flags(ARRAY) !!((ARRAY)[0] & (0x00003f7f)) - /* - * Hack -- effective elemental and poison immunity mask - */ -#define RFR_EFF_IM_ACID_MASK (RFR_IM_ACID | RFR_RES_ALL) -#define RFR_EFF_IM_ELEC_MASK (RFR_IM_ELEC | RFR_RES_ALL) -#define RFR_EFF_IM_FIRE_MASK (RFR_IM_FIRE | RFR_RES_ALL) -#define RFR_EFF_IM_COLD_MASK (RFR_IM_COLD | RFR_RES_ALL) -#define RFR_EFF_IM_POIS_MASK (RFR_IM_POIS | RFR_RES_ALL) -#define RFR_EFF_RES_SHAR_MASK (RFR_RES_SHAR | RFR_RES_ALL) -#define RFR_EFF_RES_CHAO_MASK (RFR_RES_CHAO | RFR_RES_ALL) -#define RFR_EFF_RES_NEXU_MASK (RFR_RES_NEXU | RFR_RES_ALL) - - #define MR1_SINKA 0x01 diff --git a/src/monsterrace.h b/src/monsterrace.h index bb1b5a593..775a186d2 100644 --- a/src/monsterrace.h +++ b/src/monsterrace.h @@ -447,6 +447,17 @@ struct monster_race #define RF7_HAS_LD_MASK (RF7_HAS_LITE_1 | RF7_HAS_LITE_2 | RF7_HAS_DARK_1 | RF7_HAS_DARK_2) #define RF7_SELF_LD_MASK (RF7_SELF_LITE_1 | RF7_SELF_LITE_2 | RF7_SELF_DARK_1 | RF7_SELF_DARK_2) +/* + * Hack -- effective elemental and poison immunity mask + */ +#define RFR_EFF_IM_ACID_MASK (RFR_IM_ACID | RFR_RES_ALL) +#define RFR_EFF_IM_ELEC_MASK (RFR_IM_ELEC | RFR_RES_ALL) +#define RFR_EFF_IM_FIRE_MASK (RFR_IM_FIRE | RFR_RES_ALL) +#define RFR_EFF_IM_COLD_MASK (RFR_IM_COLD | RFR_RES_ALL) +#define RFR_EFF_IM_POIS_MASK (RFR_IM_POIS | RFR_RES_ALL) +#define RFR_EFF_RES_SHAR_MASK (RFR_RES_SHAR | RFR_RES_ALL) +#define RFR_EFF_RES_CHAO_MASK (RFR_RES_CHAO | RFR_RES_ALL) +#define RFR_EFF_RES_NEXU_MASK (RFR_RES_NEXU | RFR_RES_ALL) /* * The monster race arrays -- 2.11.0