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

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

diff --git a/src/dungeon.c b/src/dungeon.c
index 6a47a02..1777ff7 100644 (file)
--- a/src/dungeon.c
+++ b/src/dungeon.c
@@ -600,8 +600,8 @@ static void sense_inventory2(void)
  */
 static void pattern_teleport(void)
 {
-       int min_level = 0;
-       int max_level = 99;
+       DEPTH min_level = 0;
+       DEPTH max_level = 99;
 
        /* Ask for level */
        if (get_check(_("他の階にテレポートしますか？", "Teleport level? ")))
@@ -628,16 +628,16 @@ static void pattern_teleport(void)
                }
 
                /* Prompt */
-               sprintf(ppp, _("テレポート先:(%d-%d)", "Teleport to level (%d-%d): "), min_level, max_level);
+               sprintf(ppp, _("テレポート先:(%d-%d)", "Teleport to level (%d-%d): "), (int)min_level, (int)max_level);
 
                /* Default */
-               sprintf(tmp_val, "%d", dun_level);
+               sprintf(tmp_val, "%d", (int)dun_level);
 
                /* Ask for a level */
                if (!get_string(ppp, tmp_val, 10)) return;
 
                /* Extract request */
-               command_arg = atoi(tmp_val);
+               command_arg = (COMMAND_ARG)atoi(tmp_val);
        }
        else if (get_check(_("通常テレポート？", "Normal teleport? ")))
        {
@@ -650,10 +650,10 @@ static void pattern_teleport(void)
        }
 
        /* Paranoia */
-       if (command_arg < min_level) command_arg = min_level;
+       if (command_arg < min_level) command_arg = (COMMAND_ARG)min_level;
 
        /* Paranoia */
-       if (command_arg > max_level) command_arg = max_level;
+       if (command_arg > max_level) command_arg = (COMMAND_ARG)max_level;
 
        /* Accept request */
        msg_format(_("%d 階にテレポートしました。", "You teleport to dungeon level %d."), command_arg);
@@ -1227,7 +1227,7 @@ void leave_tower_check(void)
  */
 bool psychometry(void)
 {
-       int             item;
+       OBJECT_IDX      item;
        object_type     *o_ptr;
        char            o_name[MAX_NLEN];
        byte            feel;
@@ -2972,8 +2972,8 @@ static void process_world_aux_recharge(void)
                if ((o_ptr->tval == TV_ROD) && (o_ptr->timeout))
                {
                        /* Determine how many rods are charging. */
-                       int temp = (o_ptr->timeout + (k_ptr->pval - 1)) / k_ptr->pval;
-                       if (temp > o_ptr->number) temp = o_ptr->number;
+                       TIME_EFFECT temp = (o_ptr->timeout + (k_ptr->pval - 1)) / k_ptr->pval;
+                       if (temp > o_ptr->number) temp = (TIME_EFFECT)o_ptr->number;
 
                        /* Decrease timeout by that number. */
                        o_ptr->timeout -= temp;
@@ -3017,7 +3017,7 @@ static void process_world_aux_recharge(void)
                if ((o_ptr->tval == TV_ROD) && (o_ptr->timeout))
                {
                        /* Charge it */
-                       o_ptr->timeout -= o_ptr->number;
+                       o_ptr->timeout -= (TIME_EFFECT)o_ptr->number;
 
                        /* Boundary control. */
                        if (o_ptr->timeout < 0) o_ptr->timeout = 0;
@@ -3206,7 +3206,7 @@ static void process_world_aux_movement(void)
  * @param m_idx 隣接数を調べたいモンスターのID
  * @return 隣接しているモンスターの数
  */
-static int get_monster_crowd_number(int m_idx)
+static int get_monster_crowd_number(MONSTER_IDX m_idx)
 {
        monster_type *m_ptr = &m_list[m_idx];
        int my = m_ptr->fy;
@@ -3244,7 +3244,7 @@ static byte get_dungeon_feeling(void)
 {
        const int base = 10;
        int rating = 0;
-       int i;
+       IDX i;
 
        /* Hack -- no feeling in the town */
        if (!dun_level) return 0;
@@ -4045,7 +4045,7 @@ extern void do_cmd_borg(void);
  */
 static void process_command(void)
 {
-       int old_now_message = now_message;
+       COMMAND_CODE old_now_message = now_message;
 
 #ifdef ALLOW_REPEAT /* TNB */
 
@@ -4939,7 +4939,7 @@ static void process_command(void)
  * @param r_idx 判定したいモンスター種族のID
  * @return 釣れる対象ならばTRUEを返す
  */
-static bool monster_tsuri(int r_idx)
+static bool monster_tsuri(MONRACE_IDX r_idx)
 {
        monster_race *r_ptr = &r_info[r_idx];
 
@@ -5035,7 +5035,7 @@ static void process_upkeep_with_speed(void)
  */
 static void process_player(void)
 {
-       int i;
+       IDX i;
 
        /*** Apply energy ***/
 
@@ -5114,7 +5114,7 @@ static void process_player(void)
                Term_xtra(TERM_XTRA_DELAY, 10);
                if (one_in_(1000))
                {
-                       int r_idx;
+                       MONRACE_IDX r_idx;
                        bool success = FALSE;
                        get_mon_num_prep(monster_tsuri,NULL);
                        r_idx = get_mon_num(dun_level ? dun_level : wilderness[p_ptr->wilderness_y][p_ptr->wilderness_x].level);
@@ -5240,13 +5240,13 @@ static void process_player(void)
        {
                (void)set_lightspeed(p_ptr->lightspeed - 1, TRUE);
        }
-       if ((p_ptr->pclass == CLASS_FORCETRAINER) && (p_ptr->magic_num1[0]))
+       if ((p_ptr->pclass == CLASS_FORCETRAINER) && P_PTR_KI)
        {
-               if (p_ptr->magic_num1[0] < 40)
+               if (P_PTR_KI < 40)
                {
-                       p_ptr->magic_num1[0] = 0;
+                       P_PTR_KI = 0;
                }
-               else p_ptr->magic_num1[0] -= 40;
+               else P_PTR_KI -= 40;
                p_ptr->update |= (PU_BONUS);
        }
        if (p_ptr->action == ACTION_LEARN)
@@ -6111,7 +6111,7 @@ void determine_today_mon(bool conv_old)
  */
 void play_game(bool new_game)
 {
-       int i;
+       MONSTER_IDX i;
        bool load_game = TRUE;
        bool init_random_seed = FALSE;
 
@@ -6188,7 +6188,7 @@ void play_game(bool new_game)
 
                p_ptr->is_dead = TRUE;
 
-               start_time = time(NULL);
+               start_time = (u32b)time(NULL);
 
                /* No suspending now */
                signals_ignore_tstp();
@@ -6480,7 +6480,7 @@ void play_game(bool new_game)
        if (new_game && ((p_ptr->pclass == CLASS_CAVALRY) || (p_ptr->pclass == CLASS_BEASTMASTER)))
        {
                monster_type *m_ptr;
-               int pet_r_idx = ((p_ptr->pclass == CLASS_CAVALRY) ? MON_HORSE : MON_YASE_HORSE);
+               IDX pet_r_idx = ((p_ptr->pclass == CLASS_CAVALRY) ? MON_HORSE : MON_YASE_HORSE);
                monster_race *r_ptr = &r_info[pet_r_idx];
                place_monster_aux(0, p_ptr->y, p_ptr->x - 1, pet_r_idx,
                                  (PM_FORCE_PET | PM_NO_KAGE));
@@ -6590,13 +6590,14 @@ void play_game(bool new_game)
 
                                        if (p_ptr->pclass == CLASS_MAGIC_EATER)
                                        {
-                                               for (i = 0; i < EATER_EXT*2; i++)
+                                               int magic_idx;
+                                               for (magic_idx = 0; magic_idx < EATER_EXT*2; magic_idx++)
                                                {
-                                                       p_ptr->magic_num1[i] = p_ptr->magic_num2[i]*EATER_CHARGE;
+                                                       p_ptr->magic_num1[magic_idx] = p_ptr->magic_num2[magic_idx]*EATER_CHARGE;
                                                }
-                                               for (; i < EATER_EXT*3; i++)
+                                               for (; magic_idx < EATER_EXT*3; magic_idx++)
                                                {
-                                                       p_ptr->magic_num1[i] = 0;
+                                                       p_ptr->magic_num1[magic_idx] = 0;
                                                }
                                        }
                                        /* Restore spell points */