./bootstrap 実行時に warning が出ないよう修正。

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

diff --git a/src/types.h b/src/types.h
index 6a1c055..344150b 100644 (file)
--- a/src/types.h
+++ b/src/types.h
@@ -52,7 +52,7 @@
  * Feature state structure
  *
  * - Action (FF_*)
- * - Result (FEAT_*)
+ * - Result (f_info ID)
  */
 typedef struct feature_state feature_state;
 
@@ -84,6 +84,7 @@ struct feature_type
 
        feature_state state[MAX_FEAT_STATES];
 
+       byte subtype;
        byte power;
 
        byte d_attr[F_LIT_MAX];   /* Default feature attribute */
@@ -348,7 +349,8 @@ struct monster_race
        s16b r_sights;                  /* Count sightings of this monster */
        s16b r_deaths;                  /* Count deaths from this monster */
 
-       s16b r_pkills;                  /* Count monsters killed in this life */
+       s16b r_pkills;                  /* Count visible monsters killed in this life */
+       s16b r_akills;                  /* Count all monsters killed in this life */
        s16b r_tkills;                  /* Count monsters killed in all lives */
 
        byte r_wake;                    /* Number of times woken up (?) */
@@ -585,7 +587,6 @@ struct monster_type
        s16b max_maxhp;         /* Max Max Hit points */
 
        s16b mtimed[MAX_MTIMED];        /* Timed status counter */
-       s16b mproc_idx[MAX_MTIMED];
 
        byte mspeed;            /* Monster "speed" */
        s16b energy_need;       /* Monster "energy" */
@@ -1101,6 +1102,8 @@ struct player_type
        s16b mane_dam[MAX_MANE];
        s16b mane_num;
 
+       s16b concent;      /* Sniper's concentration level */
+
        s16b player_hp[PY_MAX_LEVEL];
        char died_from[80];       /* What killed the player */
        cptr last_message;        /* Last message on death or retirement */
@@ -1673,3 +1676,32 @@ typedef struct
        byte tval;  /* tval of prize (0 means no prize) */
        byte sval;  /* sval of prize */
 } arena_type;
+
+
+/*
+ * A structure type for doors
+ */
+typedef struct
+{
+       s16b open;
+       s16b broken;
+       s16b closed;
+       s16b locked[MAX_LJ_DOORS];
+       s16b num_locked;
+       s16b jammed[MAX_LJ_DOORS];
+       s16b num_jammed;
+} door_type;
+
+
+#ifdef TRAVEL
+/*
+ *  A structure type for travel command
+ */
+typedef struct {
+       int run;
+       int cost[MAX_HGT][MAX_WID];
+       int x;
+       int y;
+       int dir;
+} travel_type;
+#endif