[Refactor] Moved targeting.c/h to io/

diff --git a/src/cmd/cmd-activate.c b/src/cmd/cmd-activate.c
index bb31bfe..f44b9f9 100644 (file)
--- a/src/cmd/cmd-activate.c
+++ b/src/cmd/cmd-activate.c
@@ -28,7 +28,7 @@
 #include "io/files.h"
 #include "object/object-kind.h"
 #include "object/object-ego.h"
-#include "targeting.h"
+#include "io/targeting.h"
 #include "world/world.h"
 #include "effect/spells-effect-util.h"
 #include "spell/spells-type.h"

diff --git a/src/cmd/cmd-basic.c b/src/cmd/cmd-basic.c
index 10eefda..3a978ce 100644 (file)
--- a/src/cmd/cmd-basic.c
+++ b/src/cmd/cmd-basic.c
@@ -49,7 +49,7 @@
 #include "io/files.h"
 
 #include "view/display-main-window.h"
-#include "targeting.h"
+#include "io/targeting.h"
 #include "world/world.h"
 #include "effect/spells-effect-util.h"
 #include "spell/spells3.h"

diff --git a/src/cmd/cmd-item.c b/src/cmd/cmd-item.c
index 06ae1fb..81746d2 100644 (file)
--- a/src/cmd/cmd-item.c
+++ b/src/cmd/cmd-item.c
@@ -44,7 +44,7 @@
 #include "object/object-kind.h"
 #include "autopick/autopick.h"
 #include "autopick/autopick-registry.h"
-#include "targeting.h"
+#include "io/targeting.h"
 #include "snipe.h"
 #include "player/player-race.h"
 #include "view/display-main-window.h"

diff --git a/src/cmd/cmd-magiceat.c b/src/cmd/cmd-magiceat.c
index 2b39bb8..eade1f6 100644 (file)
--- a/src/cmd/cmd-magiceat.c
+++ b/src/cmd/cmd-magiceat.c
@@ -67,7 +67,7 @@
 #include "spell/spells3.h"
 #include "player/player-class.h"
 #include "object/object-kind.h"
-#include "targeting.h"
+#include "io/targeting.h"
 
 /*!
  * @brief 魔道具術師の取り込んだ魔力一覧から選択/閲覧する /

diff --git a/src/cmd/cmd-mane.c b/src/cmd/cmd-mane.c
index cd8453f..07dea9d 100644 (file)
--- a/src/cmd/cmd-mane.c
+++ b/src/cmd/cmd-mane.c
@@ -26,7 +26,7 @@
 #include "player/player-status.h"
 #include "player/player-effects.h"
 #include "cmd-basic.h"
-#include "targeting.h"
+#include "io/targeting.h"
 #include "view/display-main-window.h"
 #include "spell/spells-type.h"
 #include "spell/spells2.h"

diff --git a/src/cmd/cmd-pet.c b/src/cmd/cmd-pet.c
index e6ed4d0..654390d 100644 (file)
--- a/src/cmd/cmd-pet.c
+++ b/src/cmd/cmd-pet.c
@@ -20,7 +20,7 @@
 #include "cmd-pet.h"
 #include "cmd-basic.h"
 #include "view/display-main-window.h"
-#include "targeting.h"
+#include "io/targeting.h"
 #include "world/world.h"
 #include "effect/spells-effect-util.h"
 

diff --git a/src/cmd/cmd-zaprod.c b/src/cmd/cmd-zaprod.c
index 51805ad..66d2538 100644 (file)
--- a/src/cmd/cmd-zaprod.c
+++ b/src/cmd/cmd-zaprod.c
@@ -14,7 +14,7 @@
 #include "spell/spells-floor.h"
 #include "cmd-basic.h"
 #include "floor/floor.h"
-#include "targeting.h"
+#include "io/targeting.h"
 #include "view/display-main-window.h"
 #include "spell/spells2.h"
 #include "spell/spells3.h"

diff --git a/src/cmd/cmd-zapwand.c b/src/cmd/cmd-zapwand.c
index 7da96b8..c5107d9 100644 (file)
--- a/src/cmd/cmd-zapwand.c
+++ b/src/cmd/cmd-zapwand.c
@@ -13,7 +13,7 @@
 #include "object/object-hook.h"
 #include "cmd-basic.h"
 #include "floor/floor.h"
-#include "targeting.h"
+#include "io/targeting.h"
 #include "view/display-main-window.h"
 #include "spell/spells2.h"
 #include "spell/spells3.h"

diff --git a/src/combat/shoot.c b/src/combat/shoot.c
index b06ab0d..1389d33 100644 (file)
--- a/src/combat/shoot.c
+++ b/src/combat/shoot.c
@@ -23,7 +23,7 @@
 #include "snipe.h"
 #include "view/display-main-window.h"
 #include "object/object-kind.h"
-#include "targeting.h"
+#include "io/targeting.h"
 #include "effect/spells-effect-util.h"
 #include "spell/process-effect.h"
 

diff --git a/src/core/game-play.c b/src/core/game-play.c
index 88d5345..3f79572 100644 (file)
--- a/src/core/game-play.c
+++ b/src/core/game-play.c
@@ -54,7 +54,7 @@
 #include "realm/realm.h"
 #include "io/save.h"
 #include "scores.h"
-#include "targeting.h"
+#include "io/targeting.h"
 #include "view/display-main-window.h"
 #include "system/system-variables.h"
 

diff --git a/src/dungeon/dungeon-processor.c b/src/dungeon/dungeon-processor.c
index 3eea6cc..6c0c11f 100644 (file)
--- a/src/dungeon/dungeon-processor.c
+++ b/src/dungeon/dungeon-processor.c
@@ -1,7 +1,7 @@
 #include "system/angband.h"
 #include "dungeon/dungeon-processor.h"
 #include "world/world.h"
-#include "targeting.h"
+#include "io/targeting.h"
 #include "core/player-processor.h"
 #include "quest.h"
 #include "dungeon/dungeon.h"

diff --git a/src/targeting.c b/src/io/targeting.c
similarity index 99%
rename from src/targeting.c
rename to src/io/targeting.c
index 868138c..70237d6 100644 (file)
--- a/src/targeting.c
+++ b/src/io/targeting.c
@@ -15,7 +15,7 @@
 #include "system/system-variables.h"
 #include "core/stuff-handler.h"
 #include "term/gameterm.h"
-#include "targeting.h"
+#include "io/targeting.h"
 
 #include "market/building.h"
 #include "cmd-pet.h"

diff --git a/src/targeting.h b/src/io/targeting.h
similarity index 100%
rename from src/targeting.h
rename to src/io/targeting.h

diff --git a/src/mind.c b/src/mind.c
index b875a1e..ab5b931 100644 (file)
--- a/src/mind.c
+++ b/src/mind.c
@@ -38,7 +38,7 @@
 #include "player/player-effects.h"
 #include "player/player-damage.h"
 #include "view/display-main-window.h"
-#include "targeting.h"
+#include "io/targeting.h"
 #include "realm/realm-song.h"
 #include "effect/spells-effect-util.h"
 #include "spell/spells-type.h"

diff --git a/src/monster/monster2.c b/src/monster/monster2.c
index 75e4e88..0f59cf4 100644 (file)
--- a/src/monster/monster2.c
+++ b/src/monster/monster2.c
@@ -41,7 +41,7 @@
 #include "world/world.h"
 #include "monster/monster-race.h"
 #include "monster/creature.h"
-#include "targeting.h"
+#include "io/targeting.h"
 #include "melee.h"
 #include "spell/process-effect.h"
 #include "core/player-processor.h"

diff --git a/src/mutation/mutation-processor.c b/src/mutation/mutation-processor.c
index d23cc81..ae74b18 100644 (file)
--- a/src/mutation/mutation-processor.c
+++ b/src/mutation/mutation-processor.c
@@ -10,7 +10,7 @@
 #include "spell/spells2.h"
 #include "spell/spells3.h"
 #include "spell/spells-floor.h"
-#include "targeting.h"
+#include "io/targeting.h"
 #include "market/store.h"
 #include "object/object-hook.h"
 #include "mutation/mutation.h"

diff --git a/src/mutation/mutation.c b/src/mutation/mutation.c
index ee15503..878d448 100644 (file)
--- a/src/mutation/mutation.c
+++ b/src/mutation/mutation.c
@@ -34,7 +34,7 @@
 #include "cmd-basic.h"
 #include "io/files.h"
 #include "floor/floor.h"
-#include "targeting.h"
+#include "io/targeting.h"
 #include "player/player-race.h"
 #include "effect/spells-effect-util.h"
 #include "spell/spells-type.h"

diff --git a/src/player/player-move.c b/src/player/player-move.c
index 9672401..cdc8f3f 100644 (file)
--- a/src/player/player-move.c
+++ b/src/player/player-move.c
@@ -175,7 +175,7 @@
 #include "world/world.h"
 #include "object/object-kind.h"
 #include "autopick/autopick.h"
-#include "targeting.h"
+#include "io/targeting.h"
 #include "spell/process-effect.h"
 #include "spell/spells3.h"
 

diff --git a/src/racial.c b/src/racial.c
index 79122fc..d4e8a9d 100644 (file)
--- a/src/racial.c
+++ b/src/racial.c
@@ -32,7 +32,7 @@
 #include "spell/spells-floor.h"
 #include "cmd-spell.h"
 #include "realm/realm-hex.h"
-#include "targeting.h"
+#include "io/targeting.h"
 #include "view/display-main-window.h"
 #include "player/player-class.h"
 #include "effect/spells-effect-util.h"

diff --git a/src/realm/realm-arcane.c b/src/realm/realm-arcane.c
index b384329..2e29d32 100644 (file)
--- a/src/realm/realm-arcane.c
+++ b/src/realm/realm-arcane.c
@@ -13,7 +13,7 @@
 #include "spell/spells-diceroll.h"
 #include "player/player-status.h"
 #include "player/player-effects.h"
-#include "targeting.h"
+#include "io/targeting.h"
 #include "realm/realm-arcane.h"
 #include "spell/spells-type.h"
 

diff --git a/src/realm/realm-chaos.c b/src/realm/realm-chaos.c
index 581628c..cd418fc 100644 (file)
--- a/src/realm/realm-chaos.c
+++ b/src/realm/realm-chaos.c
@@ -9,7 +9,7 @@
 #include "spell/spells-floor.h"
 #include "spell/spells-object.h"
 #include "spell/spells-diceroll.h"
-#include "targeting.h"
+#include "io/targeting.h"
 #include "view/display-main-window.h"
 #include "realm/realm-chaos.h"
 #include "spell/spells-type.h"

diff --git a/src/realm/realm-crusade.c b/src/realm/realm-crusade.c
index 26b9b43..322d1ef 100644 (file)
--- a/src/realm/realm-crusade.c
+++ b/src/realm/realm-crusade.c
@@ -12,7 +12,7 @@
 #include "spell/spells-diceroll.h"
 #include "player/player-class.h"
 #include "player/player-effects.h"
-#include "targeting.h"
+#include "io/targeting.h"
 #include "realm/realm-crusade.h"
 #include "spell/process-effect.h"
 #include "spell/spells2.h"

diff --git a/src/realm/realm-daemon.c b/src/realm/realm-daemon.c
index 2ec2dd1..48ef2a9 100644 (file)
--- a/src/realm/realm-daemon.c
+++ b/src/realm/realm-daemon.c
@@ -12,7 +12,7 @@
 #include "player/player-effects.h"
 #include "player/player-race.h"
 #include "player/player-damage.h"
-#include "targeting.h"
+#include "io/targeting.h"
 #include "realm/realm-daemon.h"
 #include "spell/spells2.h"
 

diff --git a/src/realm/realm-death.c b/src/realm/realm-death.c
index 583f473..b39c8ba 100644 (file)
--- a/src/realm/realm-death.c
+++ b/src/realm/realm-death.c
@@ -8,7 +8,7 @@
 #include "player/avatar.h"
 #include "player/player-status.h"
 #include "player/player-effects.h"
-#include "targeting.h"
+#include "io/targeting.h"
 #include "player/player-class.h"
 #include "player/player-damage.h"
 #include "player/player-race.h"

diff --git a/src/realm/realm-hex.c b/src/realm/realm-hex.c
index ed535ab..7910f7f 100644 (file)
--- a/src/realm/realm-hex.c
+++ b/src/realm/realm-hex.c
@@ -33,7 +33,7 @@
 #include "realm/realm-hex.h"
 #include "grid/grid.h"
 #include "monster/monster-race.h"
-#include "targeting.h"
+#include "io/targeting.h"
 #include "realm/realm-song.h"
 #include "view/display-main-window.h"
 #include "world/world.h"

diff --git a/src/realm/realm-hissatsu.c b/src/realm/realm-hissatsu.c
index 8951f6f..713f531 100644 (file)
--- a/src/realm/realm-hissatsu.c
+++ b/src/realm/realm-hissatsu.c
@@ -17,7 +17,7 @@
 #include "grid/feature.h"
 #include "spell/technic-info-table.h"
 #include "grid/grid.h"
-#include "targeting.h"
+#include "io/targeting.h"
 #include "view/display-main-window.h"
 #include "spell/spells-floor.h"
 #include "world/world.h"

diff --git a/src/realm/realm-life.c b/src/realm/realm-life.c
index b2a7e30..8d84362 100644 (file)
--- a/src/realm/realm-life.c
+++ b/src/realm/realm-life.c
@@ -7,7 +7,7 @@
 #include "player/player-status.h"
 #include "player/player-effects.h"
 #include "floor/floor.h"
-#include "targeting.h"
+#include "io/targeting.h"
 #include "realm/realm-life.h"
 #include "spell/spells-type.h"
 

diff --git a/src/realm/realm-nature.c b/src/realm/realm-nature.c
index a621a6e..f376b0d 100644 (file)
--- a/src/realm/realm-nature.c
+++ b/src/realm/realm-nature.c
@@ -11,7 +11,7 @@
 #include "player/player-race.h"
 #include "player/player-effects.h"
 #include "player/player-damage.h"
-#include "targeting.h"
+#include "io/targeting.h"
 #include "effect/spells-effect-util.h"
 #include "realm/realm-nature.h"
 #include "spell/spells-type.h"

diff --git a/src/realm/realm-song.c b/src/realm/realm-song.c
index 18cbd35..440977b 100644 (file)
--- a/src/realm/realm-song.c
+++ b/src/realm/realm-song.c
@@ -7,7 +7,7 @@
 #include "spell/spells-floor.h"
 #include "player/player-class.h"
 #include "player/player-effects.h"
-#include "targeting.h"
+#include "io/targeting.h"
 #include "view/display-main-window.h"
 #include "realm/realm-song.h"
 #include "spell/process-effect.h"

diff --git a/src/realm/realm-sorcery.c b/src/realm/realm-sorcery.c
index dcd09d9..762db41 100644 (file)
--- a/src/realm/realm-sorcery.c
+++ b/src/realm/realm-sorcery.c
@@ -9,7 +9,7 @@
 #include "spell/spells-status.h"
 #include "spell/spells-floor.h"
 #include "player/player-effects.h"
-#include "targeting.h"
+#include "io/targeting.h"
 #include "realm/realm-sorcery.h"
 #include "spell/spells2.h"
 #include "spell/spells3.h"

diff --git a/src/realm/realm-trump.c b/src/realm/realm-trump.c
index 741a5ce..1767c15 100644 (file)
--- a/src/realm/realm-trump.c
+++ b/src/realm/realm-trump.c
@@ -8,7 +8,7 @@
 #include "spell/spells-object.h"
 #include "player/player-effects.h"
 #include "player/player-class.h"
-#include "targeting.h"
+#include "io/targeting.h"
 #include "effect/spells-effect-util.h"
 #include "realm/realm-trump.h"
 #include "spell/spells-type.h"

diff --git a/src/spell/mspells3.c b/src/spell/mspells3.c
index f3cb3eb..45a2324 100644 (file)
--- a/src/spell/mspells3.c
+++ b/src/spell/mspells3.c
@@ -27,7 +27,7 @@
 #include "spell/spells-type.h"
 #include "cmd-basic.h"
 #include "player/player-effects.h"
-#include "targeting.h"
+#include "io/targeting.h"
 #include "view/display-main-window.h"
 #include "spell/spells2.h"
 #include "spell/spells3.h"

diff --git a/src/spell/spells-object.c b/src/spell/spells-object.c
index 61b3601..43e2f9b 100644 (file)
--- a/src/spell/spells-object.c
+++ b/src/spell/spells-object.c
@@ -20,7 +20,7 @@
 #include "inventory/player-inventory.h"
 #include "object/object-kind.h"
 #include "autopick/autopick.h"
-#include "targeting.h"
+#include "io/targeting.h"
 #include "view/display-main-window.h"
 
 

diff --git a/src/spell/spells-status.c b/src/spell/spells-status.c
index 49513c4..841c766 100644 (file)
--- a/src/spell/spells-status.c
+++ b/src/spell/spells-status.c
@@ -14,7 +14,7 @@
 #include "cmd-spell.h"
 #include "player/player-effects.h"
 #include "object/object-kind.h"
-#include "targeting.h"
+#include "io/targeting.h"
 #include "realm/realm-song.h"
 #include "view/display-main-window.h"
 #include "spell/spells2.h"

diff --git a/src/spell/spells2.c b/src/spell/spells2.c
index fb4a4a4..d13dd09 100644 (file)
--- a/src/spell/spells2.c
+++ b/src/spell/spells2.c
@@ -58,7 +58,7 @@
 #include "view/display-main-window.h"
 #include "object/object-kind.h"
 #include "monster/monster-race.h"
-#include "targeting.h"
+#include "io/targeting.h"
 #include "realm/realm-song.h"
 #include "locale/english.h"
 #include "effect/spells-effect-util.h"

diff --git a/src/spell/spells3.c b/src/spell/spells3.c
index abff629..3979308 100644 (file)
--- a/src/spell/spells3.c
+++ b/src/spell/spells3.c
@@ -62,7 +62,7 @@
 #include "world/world.h"
 #include "object/object-kind.h"
 #include "autopick/autopick.h"
-#include "targeting.h"
+#include "io/targeting.h"
 #include "effect/spells-effect-util.h"
 #include "spell/spells-util.h"
 #include "spell/spells-execution.h"

diff --git a/src/view/display-main-window.c b/src/view/display-main-window.c
index d14a1db..ded4ed7 100644 (file)
--- a/src/view/display-main-window.c
+++ b/src/view/display-main-window.c
@@ -46,7 +46,7 @@
 #include "floor/floor-town.h"
 #include "grid/feature.h"
 #include "object/object-kind.h"
-#include "targeting.h"
+#include "io/targeting.h"
 
 #include "market/arena-info-table.h"
 #include "effect/spells-effect-util.h"

diff --git a/src/wizard/wizard-special-process.c b/src/wizard/wizard-special-process.c
index b269f2b..90c776c 100644 (file)
--- a/src/wizard/wizard-special-process.c
+++ b/src/wizard/wizard-special-process.c
@@ -55,7 +55,7 @@
 #include "spell/monster-spell.h"
 #include "market/building.h"
 #include "object/object-kind.h"
-#include "targeting.h"
+#include "io/targeting.h"
 #include "view/display-main-window.h"
 #include "world/world.h"
 #include "spell/spells2.h"