[Refactor] #38993 o_cnt, o_max を floor_type 構造体に取り込み．

[hengband/hengband.git] / src / floor-save.c

diff --git a/src/floor-save.c b/src/floor-save.c
index 78c771f..d161d18 100644 (file)
--- a/src/floor-save.c
+++ b/src/floor-save.c
@@ -11,8 +11,14 @@
  */
 
 #include "angband.h"
+#include "util.h"
+
+#include "artifact.h"
+#include "dungeon.h"
 #include "floor.h"
-#include "generate.h"
+#include "floor-events.h"
+#include "floor-generate.h"
+#include "feature.h"
 #include "grid.h"
 #include "monster.h"
 #include "quest.h"
@@ -22,6 +28,9 @@
 #include "object-hook.h"
 #include "cmd-pet.h"
 #include "cmd-basic.h"
+#include "files.h"
+#include "player-effects.h"
+#include "world.h"
 
 static FLOOR_IDX new_floor_id;  /*!<次のフロアのID / floor_id of the destination */
 static u32b change_floor_mode;  /*!<フロア移行処理に関するフラグ / Mode flags for changing floor */
@@ -649,7 +658,7 @@ static void update_unique_artifact(s16b cur_floor_id)
        }
 
        /* Maintain artifatcs */
-       for (i = 1; i < o_max; i++)
+       for (i = 1; i < current_floor_ptr->o_max; i++)
        {
                object_type *o_ptr = &current_floor_ptr->o_list[i];
 
@@ -904,7 +913,7 @@ void leave_floor(void)
        /* Check if there is a same item */
        for (i = 0; i < INVEN_PACK; i++)
        {
-               object_type *o_ptr = &inventory[i];
+               object_type *o_ptr = &p_ptr->inventory_list[i];
 
                /* Skip dead objects */
                if (!o_ptr->k_idx) continue;
@@ -1226,7 +1235,7 @@ void change_floor(void)
                        }
 
                        /* Maintain artifatcs */
-                       for (i = 1; i < o_max; i++)
+                       for (i = 1; i < current_floor_ptr->o_max; i++)
                        {
                                object_type *o_ptr = &current_floor_ptr->o_list[i];