#37287 #37353 (2.2.0.89) EGO_IDX, ACTIVATE_IDX型を定義し、型の置換を継続中。 / Define EGO_IDX, ACTIV...

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

diff --git a/src/types.h b/src/types.h
index 7bf69ef..69fc915 100644 (file)
--- a/src/types.h
+++ b/src/types.h
@@ -148,7 +148,7 @@ struct object_kind
 
        bool tried;                     /*!< ベースアイテムを未鑑定のまま試したことがあるか /  The player has "tried" one of the items */
 
-       IDX act_idx;            /*!< 発動能力のID /  Activative ability index */
+       ACTIVATION_IDX act_idx;         /*!< 発動能力のID /  Activative ability index */
 };
 
 
@@ -1096,7 +1096,7 @@ struct player_type
 
        BIT_FLAGS special_attack;         /* Special attack capacity -LM- */
        BIT_FLAGS special_defense;        /* Special block capacity -LM- */
-       byte action;              /* Currently action */
+       ACTION_IDX action;                /* Currently action */
 
        BIT_FLAGS spell_learned1;         /* bit mask of spells learned */
        BIT_FLAGS spell_learned2;         /* bit mask of spells learned */
@@ -1433,9 +1433,9 @@ struct mind_power
 typedef struct monster_power monster_power;
 struct monster_power
 {
-       int     level;
-       int     smana;
-       int     fail;
+       PLAYER_LEVEL level;
+       MANA_POINT smana;
+       PERCENTAGE fail;
        int     manedam;
        int     manefail;
        int     use_stat;
@@ -1456,8 +1456,8 @@ struct building_type
        char owner_race[20];            /* proprietor race */
 
        char act_names[8][30];          /* action names */
-       s32b member_costs[8];           /* Costs for class members of building */
-       s32b other_costs[8];                /* Costs for nonguild members */
+       PRICE member_costs[8];           /* Costs for class members of building */
+       PRICE other_costs[8];               /* Costs for nonguild members */
        char letters[8];                /* action letters */
        s16b actions[8];                /* action codes */
        s16b action_restr[8];           /* action restrictions */
@@ -1614,7 +1614,7 @@ struct dungeon_info_type {
        PLAYER_LEVEL min_plev;         /* Minimal plev needed to enter -- it's an anti-cheating mesure */
        BIT_FLAGS16 pit;
        BIT_FLAGS16 nest;
-       byte mode;              /* Mode of combinaison of the monster flags */
+       BIT_FLAGS8 mode; /* Mode of combinaison of the monster flags */
 
        int min_m_alloc_level;  /* Minimal number of monsters per level */
        int max_m_alloc_chance; /* There is a 1/max_m_alloc_chance chance per round of creating a new monster */