#37287 #37353 (2.2.0.89) 型の置換を継続中。 / Ongoing type replacement.

[hengband/hengband.git] / src / birth.c

diff --git a/src/birth.c b/src/birth.c
index 67f4e60..ac5ee04 100644 (file)
--- a/src/birth.c
+++ b/src/birth.c
@@ -2682,7 +2682,7 @@ static void get_stats(void)
                for (i = 0; i < 2; i++)
                {
                        s32b tmp = randint0(60*60*60);
-                       base_status val;
+                       BASE_STATUS val;
 
                        /* Extract 5 + 1d3 + 1d4 + 1d5 */
                        val = 5 + 3;
@@ -2708,7 +2708,7 @@ static void get_stats(void)
                        val = 5 + 3;
                        val += tmp % 3; tmp /= 3;
                        val += tmp % 4; tmp /= 4;
-                       val += (base_status)tmp;
+                       val += (BASE_STATUS)tmp;
 
                        /* Save that value */
                        sum += val;
@@ -2751,7 +2751,7 @@ void get_max_stats(void)
        /* Acquire the stats */
        for (i = 0; i < 6; i++)
        {
-               base_status max_max = 18 + 60 + dice[i]*10;
+               BASE_STATUS max_max = 18 + 60 + dice[i]*10;
 
                /* Save that value */
                p_ptr->stat_max_max[i] = max_max;
@@ -3453,7 +3453,7 @@ static void player_wipe_without_name(void)
  * @param r_idx モンスターＩＤ
  * @return 討伐対象にできるならTRUEを返す。
  */
-static bool mon_hook_quest(int r_idx)
+static bool mon_hook_quest(MONRACE_IDX r_idx)
 {
        monster_race *r_ptr = &r_info[r_idx];
 
@@ -3480,7 +3480,7 @@ static bool mon_hook_quest(int r_idx)
  */
 void determine_random_questor(quest_type *q_ptr)
 {
-       int          r_idx;
+       MONRACE_IDX r_idx;
        monster_race *r_ptr;
 
        /* Prepare allocation table */
@@ -3867,7 +3867,7 @@ static byte player_init[MAX_CLASS][3][2] =
  * @param r_idx モンスターＩＤ
  * @return 死体を食べられるならTRUEを返す。
  */
-static bool monster_hook_human(int r_idx)
+static bool monster_hook_human(MONRACE_IDX r_idx)
 {
        monster_race *r_ptr = &r_info[r_idx];
 
@@ -3907,7 +3907,9 @@ static void add_outfit(object_type *o_ptr)
  */
 void player_outfit(void)
 {
-       int i, tv, sv;
+       int i;
+       OBJECT_TYPE_VALUE tv;
+       OBJECT_SUBTYPE_VALUE sv;
 
        object_type     forge;
        object_type     *q_ptr;
@@ -4045,10 +4047,11 @@ void player_outfit(void)
        }
        else if (p_ptr->pclass == CLASS_SORCERER)
        {
-               for (i = TV_LIFE_BOOK; i <= TV_LIFE_BOOK+MAX_MAGIC-1; i++)
+               OBJECT_TYPE_VALUE book_tval;
+               for (book_tval = TV_LIFE_BOOK; book_tval <= TV_LIFE_BOOK+MAX_MAGIC-1; book_tval++)
                {
                        /* Hack -- Give the player some arrows */
-                       object_prep(q_ptr, lookup_kind(i, 0));
+                       object_prep(q_ptr, lookup_kind(book_tval, 0));
                        q_ptr->number = 1;
 
                        add_outfit(q_ptr);