From 1d2bdfc7cdbf334b8524d332cc86110c109a3c92 Mon Sep 17 00:00:00 2001 From: deskull Date: Sat, 1 Jun 2019 17:27:28 +0900 Subject: [PATCH] =?utf8?q?[Refactor]=20#37353=20=E3=83=A2=E3=83=B3?= =?utf8?q?=E3=82=B9=E3=82=BF=E3=83=BC=E3=83=95=E3=83=A9=E3=82=B0=E3=81=AE?= =?utf8?q?=E5=85=89=E6=BA=90=E6=8C=81=E3=81=A1=E5=AE=9A=E7=BE=A9=E3=82=92?= =?utf8?q?=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 | 26 -------------------------- src/monsterrace.h | 8 ++++++++ 2 files changed, 8 insertions(+), 26 deletions(-) diff --git a/src/defines.h b/src/defines.h index be6b72ddb..65b5a219c 100644 --- a/src/defines.h +++ b/src/defines.h @@ -281,21 +281,11 @@ #define OBJ_GOLD_LIST 480 /* First "gold" entry */ #define MAX_GOLD 18 /* Number of "gold" entries */ -/*** General flag values ***/ - - /* Empty hand status */ #define EMPTY_HAND_NONE 0x0000 /* Both hands are used */ #define EMPTY_HAND_LARM 0x0001 /* Left hand is empty */ #define EMPTY_HAND_RARM 0x0002 /* Right hand is empty */ -/*** General index values ***/ - - - -/*** Object flag values ***/ - - /* * Object flags * @@ -329,22 +319,6 @@ #define have_pval_flags(ARRAY) !!((ARRAY)[0] & (0x00003f7f)) - - /* - * Hack -- "torch" masks - */ -#define RF7_LITE_MASK \ - (RF7_HAS_LITE_1 | RF7_SELF_LITE_1 | RF7_HAS_LITE_2 | RF7_SELF_LITE_2) - -#define RF7_DARK_MASK \ - (RF7_HAS_DARK_1 | RF7_SELF_DARK_1 | RF7_HAS_DARK_2 | RF7_SELF_DARK_2) - -#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 */ diff --git a/src/monsterrace.h b/src/monsterrace.h index 9d9cb7d29..bb1b5a593 100644 --- a/src/monsterrace.h +++ b/src/monsterrace.h @@ -439,6 +439,14 @@ struct monster_race u32b r_flagsr; /* Observed racial resistance flags */ }; +/* + * Hack -- "torch" masks + */ +#define RF7_LITE_MASK (RF7_HAS_LITE_1 | RF7_SELF_LITE_1 | RF7_HAS_LITE_2 | RF7_SELF_LITE_2) +#define RF7_DARK_MASK (RF7_HAS_DARK_1 | RF7_SELF_DARK_1 | RF7_HAS_DARK_2 | RF7_SELF_DARK_2) +#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) + /* * The monster race arrays -- 2.11.0