[Refactor] #37353 files.h を追加して宣言を分離。

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

diff --git a/src/autopick.c b/src/autopick.c
index 1113255..8a980eb 100644 (file)
--- a/src/autopick.c
+++ b/src/autopick.c
@@ -14,8 +14,12 @@
 #include "angband.h"
 #include "store.h"
 #include "player-status.h"
+#include "player-move.h"
+#include "object-flavor.h"
 #include "object-hook.h"
 
+#include "files.h"
+
 #define MAX_LINELEN 1024
 
 /*
@@ -1709,9 +1713,7 @@ void autopick_pickup_items(grid_type *g_ptr)
        {
                int idx;
                        object_type *o_ptr = &current_floor_ptr->o_list[this_o_idx];
-               
-               /* Acquire next object */
-               next_o_idx = o_ptr->next_o_idx;
+                               next_o_idx = o_ptr->next_o_idx;
 
                idx = is_autopick(o_ptr);
 
@@ -5994,19 +5996,19 @@ void do_cmd_edit_autopick(void)
        tb->dirty_line = -1;
        tb->filename_mode = PT_DEFAULT;
 
-       if (turn < old_autosave_turn)
+       if (current_world_ptr->game_turn < old_autosave_turn)
        {
-               while (old_autosave_turn > turn) old_autosave_turn -= TURNS_PER_TICK * TOWN_DAWN;
+               while (old_autosave_turn > current_world_ptr->game_turn) old_autosave_turn -= TURNS_PER_TICK * TOWN_DAWN;
        }
 
        /* Autosave */
-       if (turn > old_autosave_turn + 100L)
+       if (current_world_ptr->game_turn > old_autosave_turn + 100L)
        {
                do_cmd_save_game(TRUE);
-               old_autosave_turn = turn;
+               old_autosave_turn = current_world_ptr->game_turn;
        }
 
-       /* HACK -- Reset start_time to stop counting playtime while edit */
+       /* HACK -- Reset start_time to stop counting current_world_ptr->play_time while edit */
        update_playtime();
 
        /* Free old entries */
@@ -6132,7 +6134,7 @@ void do_cmd_edit_autopick(void)
        /* Reload autopick pref */
        process_autopick_file(buf);
 
-       /* HACK -- reset start_time so that playtime is not increase while edit */
+       /* HACK -- reset start_time so that current_world_ptr->play_time is not increase while edit */
        start_time = (u32b)time(NULL);
 
        /* Save cursor location */