• R/O
  • HTTP
  • SSH
  • HTTPS

hengband: Commit

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


Commit MetaInfo

Revision53ffe74d7ef993db225178179be89921e27e75e3 (tree)
Time2019-06-01 13:51:16
Authordeskull <deskull@user...>
Commiterdeskull

Log Message

[Refactor] #37353 TRG_* を object.h へ移動.

Change Summary

Incremental Difference

--- a/src/defines.h
+++ b/src/defines.h
@@ -357,48 +357,6 @@
357357
358358
359359
360-#define TRC_CURSED 0x00000001L
361-#define TRC_HEAVY_CURSE 0x00000002L
362-#define TRC_PERMA_CURSE 0x00000004L
363-#define TRC_XXX1 0x00000008L
364-#define TRC_TY_CURSE 0x00000010L
365-#define TRC_AGGRAVATE 0x00000020L
366-#define TRC_DRAIN_EXP 0x00000040L
367-#define TRC_SLOW_REGEN 0x00000080L
368-#define TRC_ADD_L_CURSE 0x00000100L
369-#define TRC_ADD_H_CURSE 0x00000200L
370-#define TRC_CALL_ANIMAL 0x00000400L
371-#define TRC_CALL_DEMON 0x00000800L
372-#define TRC_CALL_DRAGON 0x00001000L
373-#define TRC_COWARDICE 0x00002000L
374-#define TRC_TELEPORT 0x00004000L
375-#define TRC_LOW_MELEE 0x00008000L
376-#define TRC_LOW_AC 0x00010000L
377-#define TRC_LOW_MAGIC 0x00020000L
378-#define TRC_FAST_DIGEST 0x00040000L
379-#define TRC_DRAIN_HP 0x00080000L
380-#define TRC_DRAIN_MANA 0x00100000L
381-#define TRC_CALL_UNDEAD 0x00200000L
382-#define MAX_CURSE 18
383-
384-#define TRC_TELEPORT_SELF 0x00000001L
385-#define TRC_CHAINSWORD 0x00000002L
386-
387-#define TRC_SPECIAL_MASK \
388- (TRC_TY_CURSE | TRC_AGGRAVATE)
389-
390-#define TRC_HEAVY_MASK \
391- (TRC_TY_CURSE | TRC_AGGRAVATE | TRC_DRAIN_EXP | TRC_ADD_H_CURSE | \
392- TRC_CALL_DEMON | TRC_CALL_DRAGON | TRC_CALL_UNDEAD | TRC_TELEPORT)
393-
394-#define TRC_P_FLAG_MASK \
395- (TRC_TELEPORT_SELF | TRC_CHAINSWORD | \
396- TRC_TY_CURSE | TRC_DRAIN_EXP | TRC_ADD_L_CURSE | TRC_ADD_H_CURSE | \
397- TRC_CALL_ANIMAL | TRC_CALL_DEMON | TRC_CALL_DRAGON | TRC_COWARDICE | \
398- TRC_TELEPORT | TRC_DRAIN_HP | TRC_DRAIN_MANA | TRC_CALL_UNDEAD)
399-
400-
401-
402360 /*
403361 * Hack -- "torch" masks
404362 */
--- a/src/object.h
+++ b/src/object.h
@@ -338,6 +338,42 @@ struct object_type
338338 byte feeling; /* Game generated inscription number (eg, pseudo-id) */
339339
340340 BIT_FLAGS art_flags[TR_FLAG_SIZE]; /* Extra Flags for ego and artifacts */
341+
342+ #define TRC_CURSED 0x00000001L
343+ #define TRC_HEAVY_CURSE 0x00000002L
344+ #define TRC_PERMA_CURSE 0x00000004L
345+ #define TRC_XXX1 0x00000008L
346+ #define TRC_TY_CURSE 0x00000010L
347+ #define TRC_AGGRAVATE 0x00000020L
348+ #define TRC_DRAIN_EXP 0x00000040L
349+ #define TRC_SLOW_REGEN 0x00000080L
350+ #define TRC_ADD_L_CURSE 0x00000100L
351+ #define TRC_ADD_H_CURSE 0x00000200L
352+ #define TRC_CALL_ANIMAL 0x00000400L
353+ #define TRC_CALL_DEMON 0x00000800L
354+ #define TRC_CALL_DRAGON 0x00001000L
355+ #define TRC_COWARDICE 0x00002000L
356+ #define TRC_TELEPORT 0x00004000L
357+ #define TRC_LOW_MELEE 0x00008000L
358+ #define TRC_LOW_AC 0x00010000L
359+ #define TRC_LOW_MAGIC 0x00020000L
360+ #define TRC_FAST_DIGEST 0x00040000L
361+ #define TRC_DRAIN_HP 0x00080000L
362+ #define TRC_DRAIN_MANA 0x00100000L
363+ #define TRC_CALL_UNDEAD 0x00200000L
364+ #define MAX_CURSE 18
365+ #define TRC_TELEPORT_SELF 0x00000001L
366+ #define TRC_CHAINSWORD 0x00000002L
367+ #define TRC_SPECIAL_MASK \
368+ (TRC_TY_CURSE | TRC_AGGRAVATE)
369+ #define TRC_HEAVY_MASK \
370+ (TRC_TY_CURSE | TRC_AGGRAVATE | TRC_DRAIN_EXP | TRC_ADD_H_CURSE | \
371+ TRC_CALL_DEMON | TRC_CALL_DRAGON | TRC_CALL_UNDEAD | TRC_TELEPORT)
372+ #define TRC_P_FLAG_MASK \
373+ (TRC_TELEPORT_SELF | TRC_CHAINSWORD | \
374+ TRC_TY_CURSE | TRC_DRAIN_EXP | TRC_ADD_L_CURSE | TRC_ADD_H_CURSE | \
375+ TRC_CALL_ANIMAL | TRC_CALL_DEMON | TRC_CALL_DRAGON | TRC_COWARDICE | \
376+ TRC_TELEPORT | TRC_DRAIN_HP | TRC_DRAIN_MANA | TRC_CALL_UNDEAD)
341377 BIT_FLAGS curse_flags; /* Flags for curse */
342378
343379 OBJECT_IDX next_o_idx; /* Next object in stack (if any) */
Show on old repository browser