[Refactor] #38993 object_level を floor_type に取り込む。 / Move object_level to floor_type...

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

diff --git a/src/bldg.c b/src/bldg.c
index 7c52fe4..8673295 100644 (file)
--- a/src/bldg.c
+++ b/src/bldg.c
@@ -1870,7 +1870,7 @@ static bool kankin(void)
 
                                /* Prepare to make a prize */
                                object_prep(&forge, lookup_kind(prize_list[num-1].tval, prize_list[num-1].sval));
-                               apply_magic(&forge, object_level, AM_NO_FIXED_ART);
+                               apply_magic(&forge, current_floor_ptr->object_level, AM_NO_FIXED_ART);
 
                                object_aware(&forge);
                                object_known(&forge);
@@ -2079,7 +2079,7 @@ static void castle_quest(void)
        clear_bldg(4, 18);
 
        /* Current quest of the building */
-       q_index = grid_array[p_ptr->y][p_ptr->x].special;
+       q_index = current_floor_ptr->grid_array[p_ptr->y][p_ptr->x].special;
 
        /* Is there a quest available at the building? */
        if (!q_index)
@@ -3650,7 +3650,7 @@ bool tele_town(void)
        POSITION x, y;
        int num = 0;
 
-       if (dun_level)
+       if (current_floor_ptr->dun_level)
        {
                msg_print(_("この魔法は地上でしか使えない！", "This spell can only be used on the surface!"));
                return FALSE;
@@ -4192,7 +4192,7 @@ void do_cmd_quest(void)
 {
        if(p_ptr->wild_mode) return;
 
-       take_turn(p_ptr, 100);;
+       take_turn(p_ptr, 100);
 
        if (!cave_have_flag_bold(p_ptr->y, p_ptr->x, FF_QUEST_ENTER))
        {
@@ -4213,8 +4213,8 @@ void do_cmd_quest(void)
 
                leave_quest_check();
 
-               if (quest[p_ptr->inside_quest].type != QUEST_TYPE_RANDOM) dun_level = 1;
-               p_ptr->inside_quest = grid_array[p_ptr->y][p_ptr->x].special;
+               if (quest[p_ptr->inside_quest].type != QUEST_TYPE_RANDOM) current_floor_ptr->dun_level = 1;
+               p_ptr->inside_quest = current_floor_ptr->grid_array[p_ptr->y][p_ptr->x].special;
 
                p_ptr->leaving = TRUE;
        }
@@ -4234,7 +4234,7 @@ void do_cmd_bldg(void)
 
        if(p_ptr->wild_mode) return;
 
-       take_turn(p_ptr, 100);;
+       take_turn(p_ptr, 100);
 
        if (!cave_have_flag_bold(p_ptr->y, p_ptr->x, FF_BLDG))
        {
@@ -4242,7 +4242,7 @@ void do_cmd_bldg(void)
                return;
        }
 
-       which = f_info[grid_array[p_ptr->y][p_ptr->x].feat].subtype;
+       which = f_info[current_floor_ptr->grid_array[p_ptr->y][p_ptr->x].feat].subtype;
 
        bldg = &building[which];