[Refactor] #37353 型の置換。 / Type replacement.

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

diff --git a/src/types.h b/src/types.h
index 4a72eec..7eec923 100644 (file)
--- a/src/types.h
+++ b/src/types.h
@@ -200,7 +200,7 @@ struct artifact_type
        byte cur_num;           /*! 現在の生成数 / Number created (0 or 1) */
        byte max_num;           /*! (未使用)最大生成数 / Unused (should be "1") */
 
-       s16b floor_id;      /*! アイテムを落としたフロアのID / Leaved on this location last time */
+       FLOOR_IDX floor_id;      /*! アイテムを落としたフロアのID / Leaved on this location last time */
 
        byte act_idx;           /*! 発動能力ID / Activative ability index */
 };
@@ -1151,7 +1151,7 @@ struct player_type
        s16b today_mon;           /* Wanted monster */
 
        bool dtrap;               /* Whether you are on trap-safe grids */
-       s16b floor_id;            /* Current floor location */ 
+       FLOOR_IDX floor_id;            /* Current floor location */ 
 
        bool autopick_autoregister; /* auto register is in-use or not */
 
@@ -1218,6 +1218,7 @@ struct player_type
        ALIGNMENT align;                                /* Good/evil/neutral */
        POSITION run_py;
        POSITION run_px;
+       DIRECTION fishing_dir;
 
 
        /*** Extracted fields ***/
@@ -1665,7 +1666,7 @@ struct dungeon_info_type {
 typedef struct {
        cptr name;          /*!< 自動拾い/破壊定義の名称一致基準 / Items which have 'name' as part of its name match */
        cptr insc;          /*!< 対象となったアイテムに自動で刻む内容 / Items will be auto-inscribed as 'insc' */
-       u32b flag[2];       /*!< キーワードに関する汎用的な条件フラグ / Misc. keyword to be matched */
+       BIT_FLAGS flag[2];       /*!< キーワードに関する汎用的な条件フラグ / Misc. keyword to be matched */
        byte action;        /*!< 対象のアイテムを拾う/破壊/放置するかの指定フラグ / Auto-pickup or Destroy or Leave items */
        byte dice;          /*!< 武器のダイス値基準値 / Weapons which have more than 'dice' dice match */
        byte bonus;         /*!< アイテムのボーナス基準値 / Items which have more than 'bonus' magical bonus match */
@@ -1677,7 +1678,7 @@ typedef struct {
  */
 typedef struct 
 {
-       s16b floor_id;        /* No recycle until 65536 IDs are all used */
+       FLOOR_IDX floor_id;        /* No recycle until 65536 IDs are all used */
        s16b savefile_id;     /* ID for savefile (from 0 to MAX_SAVED_FLOOR) */
        DEPTH dun_level;
        s32b last_visit;      /* Time count of last visit. 0 for new floor. */
@@ -1694,7 +1695,7 @@ typedef struct
 {
        BIT_FLAGS info;
        FEAT_IDX feat;
-       s16b mimic;
+       FEAT_IDX mimic;
        s16b special;
        u16b occurrence;
 } cave_template_type;
@@ -1734,8 +1735,8 @@ typedef struct
 typedef struct {
        int run; /* Remaining grid number */
        int cost[MAX_HGT][MAX_WID];
-       int x; /* Target X */
-       int y; /* Target Y */
+       POSITION x; /* Target X */
+       POSITION y; /* Target Y */
        DIRECTION dir; /* Running direction */
 } travel_type;
 #endif