• R/O
  • HTTP
  • SSH
  • HTTPS

hengband: Commit

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


Commit MetaInfo

Revision1d2bdfc7cdbf334b8524d332cc86110c109a3c92 (tree)
Time2019-06-01 17:27:28
Authordeskull <deskull@user...>
Commiterdeskull

Log Message

[Refactor] #37353 モンスターフラグの光源持ち定義を monsterrace.h へ移動。

Change Summary

Incremental Difference

--- a/src/defines.h
+++ b/src/defines.h
@@ -281,21 +281,11 @@
281281 #define OBJ_GOLD_LIST 480 /* First "gold" entry */
282282 #define MAX_GOLD 18 /* Number of "gold" entries */
283283
284-/*** General flag values ***/
285-
286-
287284 /* Empty hand status */
288285 #define EMPTY_HAND_NONE 0x0000 /* Both hands are used */
289286 #define EMPTY_HAND_LARM 0x0001 /* Left hand is empty */
290287 #define EMPTY_HAND_RARM 0x0002 /* Right hand is empty */
291288
292-/*** General index values ***/
293-
294-
295-
296-/*** Object flag values ***/
297-
298-
299289 /*
300290 * Object flags
301291 *
@@ -329,22 +319,6 @@
329319 #define have_pval_flags(ARRAY) !!((ARRAY)[0] & (0x00003f7f))
330320
331321
332-
333- /*
334- * Hack -- "torch" masks
335- */
336-#define RF7_LITE_MASK \
337- (RF7_HAS_LITE_1 | RF7_SELF_LITE_1 | RF7_HAS_LITE_2 | RF7_SELF_LITE_2)
338-
339-#define RF7_DARK_MASK \
340- (RF7_HAS_DARK_1 | RF7_SELF_DARK_1 | RF7_HAS_DARK_2 | RF7_SELF_DARK_2)
341-
342-#define RF7_HAS_LD_MASK \
343- (RF7_HAS_LITE_1 | RF7_HAS_LITE_2 | RF7_HAS_DARK_1 | RF7_HAS_DARK_2)
344-
345-#define RF7_SELF_LD_MASK \
346- (RF7_SELF_LITE_1 | RF7_SELF_LITE_2 | RF7_SELF_DARK_1 | RF7_SELF_DARK_2)
347-
348322 /*
349323 * Hack -- effective elemental and poison immunity mask
350324 */
--- a/src/monsterrace.h
+++ b/src/monsterrace.h
@@ -439,6 +439,14 @@ struct monster_race
439439 u32b r_flagsr; /* Observed racial resistance flags */
440440 };
441441
442+/*
443+ * Hack -- "torch" masks
444+ */
445+#define RF7_LITE_MASK (RF7_HAS_LITE_1 | RF7_SELF_LITE_1 | RF7_HAS_LITE_2 | RF7_SELF_LITE_2)
446+#define RF7_DARK_MASK (RF7_HAS_DARK_1 | RF7_SELF_DARK_1 | RF7_HAS_DARK_2 | RF7_SELF_DARK_2)
447+#define RF7_HAS_LD_MASK (RF7_HAS_LITE_1 | RF7_HAS_LITE_2 | RF7_HAS_DARK_1 | RF7_HAS_DARK_2)
448+#define RF7_SELF_LD_MASK (RF7_SELF_LITE_1 | RF7_SELF_LITE_2 | RF7_SELF_DARK_1 | RF7_SELF_DARK_2)
449+
442450
443451 /*
444452 * The monster race arrays
Show on old repository browser