Add new option -- show_ammo_detail / show_ammo_no_crit

[hengband/hengband.git] / src / types.h

diff --git a/src/types.h b/src/types.h
index 344150b..8e34eec 100644 (file)
--- a/src/types.h
+++ b/src/types.h
@@ -153,6 +153,8 @@ struct object_kind
        bool aware;                     /* The player is "aware" of the item's effects */
 
        bool tried;                     /* The player has "tried" one of the items */
+
+       byte act_idx;           /* Activative ability index */
 };
 
 
@@ -200,6 +202,8 @@ struct artifact_type
        byte max_num;           /* Unused (should be "1") */
 
        s16b floor_id;          /* Leaved on this location last time */
+
+       byte act_idx;           /* Activative ability index */
 };
 
 
@@ -231,6 +235,8 @@ struct ego_item_type
        u32b flags[TR_FLAG_SIZE];       /* Ego-Item Flags */
 
        u32b gen_flags;         /* flags for generate */
+
+       byte act_idx;           /* Activative ability index */
 };
 
 
@@ -527,10 +533,10 @@ struct object_type
        byte name2;                     /* Ego-Item type, if any */
 
        byte xtra1;                     /* Extra info type (now unused) */
-       byte xtra2;                     /* Extra info index */
-       byte xtra3;                     /* Extra info */
-       s16b xtra4;                     /* Extra info */
-       s16b xtra5;                     /* Extra info */
+       byte xtra2;                     /* Extra info activation index */
+       byte xtra3;                     /* Extra info for weaponsmith */
+       s16b xtra4;                     /* Extra info fuel or captured monster's current HP */
+       s16b xtra5;                     /* Extra info captured monster's max HP */
 
        s16b to_h;                      /* Plusses to hit */
        s16b to_d;                      /* Plusses to damage */
@@ -585,6 +591,7 @@ struct monster_type
        s16b hp;                /* Current Hit points */
        s16b maxhp;             /* Max Hit points */
        s16b max_maxhp;         /* Max Max Hit points */
+       u32b dealt_damage;              /* Sum of damages dealt by player */
 
        s16b mtimed[MAX_MTIMED];        /* Timed status counter */
 
@@ -1076,6 +1083,7 @@ struct player_type
        byte recall_dungeon;      /* Dungeon set to be recalled */
 
        s16b energy_need;         /* Energy needed for next move */
+       s16b enchant_energy_need;         /* Energy needed for next upkeep effect        */
 
        s16b food;                /* Current nutrition */
 
@@ -1512,7 +1520,7 @@ typedef struct tag_type tag_type;
 struct tag_type
 {
        int     tag;
-       void    *pointer;
+       int     index;
 };
 
 typedef bool (*monster_hook_type)(int r_idx);
@@ -1698,10 +1706,28 @@ typedef struct
  *  A structure type for travel command
  */
 typedef struct {
-       int run;
+       int run; /* Remaining grid number */
        int cost[MAX_HGT][MAX_WID];
-       int x;
-       int y;
-       int dir;
+       int x; /* Target X */
+       int y; /* Target Y */
+       int dir; /* Running direction */
 } travel_type;
 #endif
+
+typedef struct {
+       cptr flag;
+       byte index;
+       byte level;
+       s32b value;
+       struct {
+               int constant;
+               int dice;
+       } timeout;
+       cptr desc;
+} activation_type;
+
+typedef struct {
+       int flag;
+       int type;
+       cptr name;
+} dragonbreath_type;