• R/O
  • HTTP
  • SSH
  • HTTPS

hengband: Commit

変愚蛮怒のメインリポジトリです


Commit MetaInfo

Revisionfd127352be7b8e1695bc32f700517b02ee5b8dd6 (tree)
Time2019-06-01 17:36:13
Authordeskull <deskull@user...>
Commiterdeskull

Log Message

[Refactor] #37353 RFR_* 耐性フラグまとめを monsterrace.h へ移動。

Change Summary

Incremental Difference

--- a/src/defines.h
+++ b/src/defines.h
@@ -319,19 +319,6 @@
319319 #define have_pval_flags(ARRAY) !!((ARRAY)[0] & (0x00003f7f))
320320
321321
322- /*
323- * Hack -- effective elemental and poison immunity mask
324- */
325-#define RFR_EFF_IM_ACID_MASK (RFR_IM_ACID | RFR_RES_ALL)
326-#define RFR_EFF_IM_ELEC_MASK (RFR_IM_ELEC | RFR_RES_ALL)
327-#define RFR_EFF_IM_FIRE_MASK (RFR_IM_FIRE | RFR_RES_ALL)
328-#define RFR_EFF_IM_COLD_MASK (RFR_IM_COLD | RFR_RES_ALL)
329-#define RFR_EFF_IM_POIS_MASK (RFR_IM_POIS | RFR_RES_ALL)
330-#define RFR_EFF_RES_SHAR_MASK (RFR_RES_SHAR | RFR_RES_ALL)
331-#define RFR_EFF_RES_CHAO_MASK (RFR_RES_CHAO | RFR_RES_ALL)
332-#define RFR_EFF_RES_NEXU_MASK (RFR_RES_NEXU | RFR_RES_ALL)
333-
334-
335322 #define MR1_SINKA 0x01
336323
337324
--- a/src/monsterrace.h
+++ b/src/monsterrace.h
@@ -447,6 +447,17 @@ struct monster_race
447447 #define RF7_HAS_LD_MASK (RF7_HAS_LITE_1 | RF7_HAS_LITE_2 | RF7_HAS_DARK_1 | RF7_HAS_DARK_2)
448448 #define RF7_SELF_LD_MASK (RF7_SELF_LITE_1 | RF7_SELF_LITE_2 | RF7_SELF_DARK_1 | RF7_SELF_DARK_2)
449449
450+/*
451+ * Hack -- effective elemental and poison immunity mask
452+ */
453+#define RFR_EFF_IM_ACID_MASK (RFR_IM_ACID | RFR_RES_ALL)
454+#define RFR_EFF_IM_ELEC_MASK (RFR_IM_ELEC | RFR_RES_ALL)
455+#define RFR_EFF_IM_FIRE_MASK (RFR_IM_FIRE | RFR_RES_ALL)
456+#define RFR_EFF_IM_COLD_MASK (RFR_IM_COLD | RFR_RES_ALL)
457+#define RFR_EFF_IM_POIS_MASK (RFR_IM_POIS | RFR_RES_ALL)
458+#define RFR_EFF_RES_SHAR_MASK (RFR_RES_SHAR | RFR_RES_ALL)
459+#define RFR_EFF_RES_CHAO_MASK (RFR_RES_CHAO | RFR_RES_ALL)
460+#define RFR_EFF_RES_NEXU_MASK (RFR_RES_NEXU | RFR_RES_ALL)
450461
451462 /*
452463 * The monster race arrays
Show on old repository browser