[Refactor] #39970 Moved world.c/h to world/

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

diff --git a/src/object2.c b/src/object2.c
index f247fc8..9b0c6a6 100644 (file)
--- a/src/object2.c
+++ b/src/object2.c
@@ -13,25 +13,26 @@
 
 #include "angband.h"
 #include "util.h"
-#include "world.h"
-#include "term.h"
+#include "main/sound-definitions-table.h"
+#include "world/world.h"
+#include "gameterm.h"
 
 #include "object.h"
 
 #include "io/write-diary.h"
 #include "cmd/cmd-dump.h"
 #include "cmd/cmd-spell.h"
-#include "spells.h"
+#include "spell/spells3.h"
 #include "dungeon.h"
 #include "floor.h"
 #include "grid.h"
-#include "objectkind.h"
+#include "object/object-kind.h"
 #include "object-boost.h"
 #include "object-ego.h"
 #include "object-flavor.h"
 #include "object-hook.h"
 #include "object-curse.h"
-#include "objectkind-hook.h"
+#include "object/object-kind-hook.h"
 #include "artifact.h"
 #include "feature.h"
 #include "player-status.h"
@@ -42,7 +43,7 @@
 #include "monster.h"
 #include "monsterrace-hook.h"
 #include "object-ego.h"
-#include "view-mainwindow.h"
+#include "view/display-main-window.h"
 
  /*
   * todo この説明長すぎ。何とかしたい
@@ -1110,6 +1111,7 @@ int object_similar_part(object_type *o_ptr, object_type *j_ptr)
        {
                if (!object_is_known(o_ptr) || !object_is_known(j_ptr)) return 0;
        }
+               /* Fall through */
        case TV_BOLT:
        case TV_ARROW:
        case TV_SHOT:
@@ -2899,7 +2901,7 @@ static void a_m_aux_4(player_type *owner_ptr, object_type *o_ptr, int power)
                get_mon_num_prep(owner_ptr, item_monster_okay, NULL);
                while (TRUE)
                {
-                       i = get_mon_num(owner_ptr, floor_ptr->dun_level);
+                       i = get_mon_num(owner_ptr, floor_ptr->dun_level, 0);
                        r_ptr = &r_info[i];
                        check = (floor_ptr->dun_level < r_ptr->level) ? (r_ptr->level - floor_ptr->dun_level) : 0;
                        if (!r_ptr->rarity) continue;