From 24c45cd85efb34f56c4df1a22b1cac85f12eaf3d Mon Sep 17 00:00:00 2001 From: deskull Date: Fri, 7 Jun 2019 02:02:13 +0900 Subject: [PATCH] =?utf8?q?[Refactor]=20#37353=20have=5Fdark=5Fflag()=20?= =?utf8?q?=E3=81=A8=20have=5Flite=5Fflag()=E3=80=80=E3=82=92=20HAVE=5FDARK?= =?utf8?q?=5FFLAG()=20=E3=81=A8=20HAVE=5FLITE=5FFLAG()=20=E3=81=AB?= =?utf8?q?=E6=94=B9=E5=90=8D=E3=81=97=E3=81=A6=20object.h=20=E3=81=B8?= =?utf8?q?=E7=A7=BB=E5=8B=95=EF=BC=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- src/defines.h | 8 -------- src/files.c | 4 ++-- src/object-flavor.c | 4 ++-- src/object.h | 7 +++++++ 4 files changed, 11 insertions(+), 12 deletions(-) diff --git a/src/defines.h b/src/defines.h index cfc8ca41f..562324947 100644 --- a/src/defines.h +++ b/src/defines.h @@ -140,11 +140,3 @@ #else #define _(JAPANESE,ENGLISH) (ENGLISH) #endif - -/* Lite flag macro */ -#define have_lite_flag(ARRAY) \ - (have_flag(ARRAY, TR_LITE_1) || have_flag(ARRAY, TR_LITE_2) || have_flag(ARRAY, TR_LITE_3)) - -#define have_dark_flag(ARRAY) \ - (have_flag(ARRAY, TR_LITE_M1) || have_flag(ARRAY, TR_LITE_M2) || have_flag(ARRAY, TR_LITE_M3)) - diff --git a/src/files.c b/src/files.c index 6967c5ebe..220ed2bff 100644 --- a/src/files.c +++ b/src/files.c @@ -3094,12 +3094,12 @@ static void display_flag_aux(TERM_LEN row, TERM_LEN col, concptr header, } else if (flag1 == TR_LITE_1) { - if (have_dark_flag(flgs)) + if (HAVE_DARK_FLAG(flgs)) { c_put_str(TERM_L_DARK, "+", row, col); header_color = TERM_WHITE; } - else if (have_lite_flag(flgs)) + else if (HAVE_LITE_FLAG(flgs)) { c_put_str(TERM_WHITE, "+", row, col); header_color = TERM_WHITE; diff --git a/src/object-flavor.c b/src/object-flavor.c index 77db5be38..508faadad 100644 --- a/src/object-flavor.c +++ b/src/object-flavor.c @@ -1089,13 +1089,13 @@ static char *get_ability_abbreviation(char *ptr, object_type *o_ptr, bool kanji, } /* Remove lite flags when this is a dark lite object */ - if (have_dark_flag(flgs)) + if (HAVE_DARK_FLAG(flgs)) { if (have_flag(flgs, TR_LITE_1)) remove_flag(flgs, TR_LITE_1); if (have_flag(flgs, TR_LITE_2)) remove_flag(flgs, TR_LITE_2); if (have_flag(flgs, TR_LITE_3)) remove_flag(flgs, TR_LITE_3); } - else if (have_lite_flag(flgs)) + else if (HAVE_LITE_FLAG(flgs)) { add_flag(flgs, TR_LITE_1); if (have_flag(flgs, TR_LITE_2)) remove_flag(flgs, TR_LITE_2); diff --git a/src/object.h b/src/object.h index 684620246..0eb74b857 100644 --- a/src/object.h +++ b/src/object.h @@ -178,6 +178,13 @@ #define OBJ_GOLD_LIST 480 /* First "gold" entry */ #define MAX_GOLD 18 /* Number of "gold" entries */ +/* Lite flag macro */ +#define HAVE_LITE_FLAG(ARRAY) \ + (have_flag(ARRAY, TR_LITE_1) || have_flag(ARRAY, TR_LITE_2) || have_flag(ARRAY, TR_LITE_3)) + +#define HAVE_DARK_FLAG(ARRAY) \ + (have_flag(ARRAY, TR_LITE_M1) || have_flag(ARRAY, TR_LITE_M2) || have_flag(ARRAY, TR_LITE_M3)) + typedef struct object_type object_type; struct object_type -- 2.11.0