[Refactor] #38862 Moved feature.c/h, grid.c/h and trap.c/h to grid/

[hengbandforosx/hengbandosx.git] / src / targeting.c

diff --git a/src/targeting.c b/src/targeting.c
index f7ff99d..18f95eb 100644 (file)
--- a/src/targeting.c
+++ b/src/targeting.c
@@ -10,35 +10,36 @@
  * 2014 Deskull rearranged comment for Doxygen.
  */
 
-#include "angband.h"
+#include "system/angband.h"
 #include "util.h"
-#include "core.h"
+#include "system/system-variables.h"
+#include "core/stuff-handler.h"
 #include "gameterm.h"
 #include "targeting.h"
 
 #include "market/building.h"
 #include "cmd-pet.h"
-#include "dungeon-file.h"
-#include "object-curse.h"
-#include "object-flavor.h"
-#include "monster.h"
-#include "monsterrace-hook.h"
+#include "dungeon/dungeon-file.h"
+#include "object/object-curse.h"
+#include "object/object-flavor.h"
+#include "monster/monster.h"
+#include "monster/monsterrace-hook.h"
 #include "object/object-kind-hook.h"
 #include "sort.h"
-#include "spells-summon.h"
-#include "grid.h"
-#include "floor.h"
-#include "floor-events.h"
-#include "floor-town.h"
+#include "spell/spells-summon.h"
+#include "grid/grid.h"
+#include "floor/floor.h"
+#include "floor/floor-events.h"
+#include "floor/floor-town.h"
 #include "player-inventory.h"
-#include "player-move.h"
-#include "player-status.h"
-#include "monster-status.h"
+#include "player/player-move.h"
+#include "player/player-status.h"
+#include "monster/monster-status.h"
 #include "view/display-main-window.h"
-#include "feature.h"
+#include "grid/feature.h"
 #include "quest.h"
-#include "dungeon.h"
-#include "world.h"
+#include "dungeon/dungeon.h"
+#include "world/world.h"
 #include "effect/spells-effect-util.h"
 
  /*!
@@ -528,7 +529,7 @@ static char target_set_aux(player_type *subject_ptr, POSITION y, POSITION x, BIT
        /* Scan all objects in the grid */
        if (easy_floor)
        {
-               floor_num = scan_floor(subject_ptr, floor_list, y, x, 0x02);
+               floor_num = scan_floor(subject_ptr, floor_list, y, x, 0x02, 0);
 
                if (floor_num)
                {
@@ -767,7 +768,7 @@ static char target_set_aux(player_type *subject_ptr, POSITION y, POSITION x, BIT
 
                                /* Display */
                                show_gold_on_floor = TRUE;
-                               (void)show_floor(subject_ptr, 0, y, x, &min_width);
+                               (void)show_floor(subject_ptr, 0, y, x, &min_width, 0);
                                show_gold_on_floor = FALSE;
 
                                /* Prompt */