[Refactor] #38862 Moved artifact.c/h to object/

diff --git a/Hengband/Hengband/Hengband.vcxproj b/Hengband/Hengband/Hengband.vcxproj
index 6c4e53b..7a71b90 100644 (file)
--- a/Hengband/Hengband/Hengband.vcxproj
+++ b/Hengband/Hengband/Hengband.vcxproj
@@ -152,7 +152,7 @@
     </Link>\r
   </ItemDefinitionGroup>\r
   <ItemGroup>\r
-    <ClCompile Include="..\..\src\artifact.c" />\r
+    <ClCompile Include="..\..\src\object\artifact.c" />\r
     <ClCompile Include="..\..\src\autopick\autopick-command-menu.c" />\r
     <ClCompile Include="..\..\src\autopick\autopick-describer.c" />\r
     <ClCompile Include="..\..\src\autopick\autopick-destroyer.c" />\r
@@ -352,7 +352,7 @@
     <ClCompile Include="..\..\src\spell\process-effect.c" />\r
     <ClCompile Include="..\..\src\spell\spells-execution.c" />\r
     <ClCompile Include="..\..\src\spell\technic-info-table.c" />\r
-    <ClInclude Include="..\..\src\artifact.h" />\r
+    <ClInclude Include="..\..\src\object\artifact.h" />\r
     <ClInclude Include="..\..\src\autopick\autopick-command-menu.h" />\r
     <ClInclude Include="..\..\src\autopick\autopick-commands-table.h" />\r
     <ClInclude Include="..\..\src\autopick\autopick-describer.h" />\r

diff --git a/Hengband/Hengband/Hengband.vcxproj.filters b/Hengband/Hengband/Hengband.vcxproj.filters
index e978304..6c5f982 100644 (file)
--- a/Hengband/Hengband/Hengband.vcxproj.filters
+++ b/Hengband/Hengband/Hengband.vcxproj.filters
@@ -12,9 +12,6 @@
     <ClCompile Include="..\..\src\avatar.c">
       <Filter>player</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\artifact.c">
-      <Filter>object</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\chest.c">
       <Filter>object</Filter>
     </ClCompile>
@@ -829,6 +826,9 @@
     <ClCompile Include="..\..\src\io\load.c">
       <Filter>io</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\object\artifact.c">
+      <Filter>object</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\src\gamevalue.h" />
@@ -843,9 +843,6 @@
     <ClInclude Include="..\..\src\avatar.h">
       <Filter>player</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\artifact.h">
-      <Filter>object</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\chest.h">
       <Filter>object</Filter>
     </ClInclude>
@@ -1701,6 +1698,9 @@
     <ClInclude Include="..\..\src\io\load.h">
       <Filter>io</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\object\artifact.h">
+      <Filter>object</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\src\wall.bmp" />

diff --git a/src/Makefile.am b/src/Makefile.am
index fd46580..afe10c0 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -5,8 +5,6 @@ AUTOMAKE_OPTIONS = foreign subdir-objects
 bin_PROGRAMS = hengband
 
 hengband_SOURCES = \
-       artifact.c artifact.h \
-       \
        system/angband.h system/h-basic.h system/h-config.h \
        system/h-define.h system/h-system.h system/h-type.h \
        system/system-variables.c system/system-variables.h \
@@ -144,6 +142,7 @@ hengband_SOURCES = \
        mutation/mutation.c mutation/mutation.h \
        mutation/mutation-processor.c mutation/mutation-processor.h \
        \
+       object/artifact.c object/artifact.h \
        object/object-boost.c object/object-boost.h \
        object/object-curse.c object/object-curse.h \
        object/object-broken.c object/object-broken.h \

diff --git a/src/birth/birth.c b/src/birth/birth.c
index d5a0cc8..9e04679 100644 (file)
--- a/src/birth/birth.c
+++ b/src/birth/birth.c
@@ -21,7 +21,7 @@
 #include "market/building.h"
 #include "util.h"
 
-#include "artifact.h"
+#include "object/artifact.h"
 #include "autopick/autopick.h"
 #include "avatar.h"
 #include "birth/birth.h"

diff --git a/src/cmd/cmd-activate.c b/src/cmd/cmd-activate.c
index 23579d4..f2563e4 100644 (file)
--- a/src/cmd/cmd-activate.c
+++ b/src/cmd/cmd-activate.c
@@ -14,7 +14,7 @@
 #include "cmd/cmd-save.h"
 #include "object/object-hook.h"
 #include "sort.h"
-#include "artifact.h"
+#include "object/artifact.h"
 #include "avatar.h"
 #include "spell/spells-summon.h"
 #include "spell/spells-status.h"

diff --git a/src/cmd/cmd-basic.c b/src/cmd/cmd-basic.c
index 60e03b6..7a677e2 100644 (file)
--- a/src/cmd/cmd-basic.c
+++ b/src/cmd/cmd-basic.c
@@ -27,7 +27,7 @@
 #include "object/object-hook.h"
 #include "monster/monster-status.h"
 #include "quest.h"
-#include "artifact.h"
+#include "object/artifact.h"
 #include "avatar.h"
 #include "player/player-status.h"
 #include "realm/realm-hex.h"

diff --git a/src/cmd/cmd-dump.c b/src/cmd/cmd-dump.c
index 5b93929..c8af602 100644 (file)
--- a/src/cmd/cmd-dump.c
+++ b/src/cmd/cmd-dump.c
@@ -43,7 +43,7 @@
 #include "view/display-player.h" // 暫定。後で消す.
 #include "player/player-personality.h"
 #include "quest.h"
-#include "artifact.h"
+#include "object/artifact.h"
 #include "floor/floor-town.h"
 #include "cmd/feeling-table.h"
 #include "locale/english.h"

diff --git a/src/cmd/cmd-item.c b/src/cmd/cmd-item.c
index 5c2db57..9c3aa69 100644 (file)
--- a/src/cmd/cmd-item.c
+++ b/src/cmd/cmd-item.c
@@ -32,7 +32,7 @@
 #include "object/object-ego.h"
 #include "sort.h"
 #include "quest.h"
-#include "artifact.h"
+#include "object/artifact.h"
 #include "avatar.h"
 #include "player/player-status.h"
 #include "player/player-effects.h"

diff --git a/src/cmd/cmd-read.c b/src/cmd/cmd-read.c
index ae664c0..af0f0ca 100644 (file)
--- a/src/cmd/cmd-read.c
+++ b/src/cmd/cmd-read.c
@@ -12,7 +12,7 @@
 
 #include "object/object-flavor.h"
 #include "object/object-hook.h"
-#include "artifact.h"
+#include "object/artifact.h"
 #include "avatar.h"
 #include "player/player-status.h"
 #include "player/player-damage.h"

diff --git a/src/combat/melee.c b/src/combat/melee.c
index 71870dc..85fd709 100644 (file)
--- a/src/combat/melee.c
+++ b/src/combat/melee.c
@@ -16,7 +16,7 @@
 #include "util.h"
 #include "main/sound-definitions-table.h"
 
-#include "artifact.h"
+#include "object/artifact.h"
 #include "cmd-pet.h"
 #include "monster/monsterrace-hook.h"
 #include "melee.h"

diff --git a/src/combat/shoot.c b/src/combat/shoot.c
index a044981..2bb84ae 100644 (file)
--- a/src/combat/shoot.c
+++ b/src/combat/shoot.c
@@ -7,7 +7,7 @@
 #include "monster/monster.h"
 #include "monster/monster-status.h"
 #include "spell/monster-spell.h"
-#include "artifact.h"
+#include "object/artifact.h"
 #include "avatar.h"
 #include "player/player-status.h"
 #include "player/player-skill.h"

diff --git a/src/dungeon/dungeon-file.c b/src/dungeon/dungeon-file.c
index a2d460f..28724aa 100644 (file)
--- a/src/dungeon/dungeon-file.c
+++ b/src/dungeon/dungeon-file.c
@@ -58,7 +58,7 @@
 #include "realm/realm.h"
 
 #include "trap.h"
-#include "artifact.h"
+#include "object/artifact.h"
 #include "cmd-activate.h"
 #include "gameterm.h"
 #include "wild.h"

diff --git a/src/effect/effect-player-resist-hurt.c b/src/effect/effect-player-resist-hurt.c
index 10c04b2..8c6410e 100644 (file)
--- a/src/effect/effect-player-resist-hurt.c
+++ b/src/effect/effect-player-resist-hurt.c
@@ -4,7 +4,7 @@
 #include "player/player-damage.h"
 #include "world/world.h"
 #include "object/object-broken.h"
-#include "artifact.h"
+#include "object/artifact.h"
 #include "player/player-effects.h"
 #include "mutation/mutation.h"
 #include "spell/monster-spell.h"

diff --git a/src/floor/floor-save.c b/src/floor/floor-save.c
index 0eb7754..c192a35 100644 (file)
--- a/src/floor/floor-save.c
+++ b/src/floor/floor-save.c
@@ -16,7 +16,7 @@
 #include "io/load.h"
 #include "util.h"
 
-#include "artifact.h"
+#include "object/artifact.h"
 #include "dungeon/dungeon.h"
 #include "floor/floor.h"
 #include "floor/floor-save.h"

diff --git a/src/floor/floor-streams.c b/src/floor/floor-streams.c
index 50b7258..9ada0e3 100644 (file)
--- a/src/floor/floor-streams.c
+++ b/src/floor/floor-streams.c
@@ -18,7 +18,7 @@
 #include "system/angband.h"
 #include "util.h"
 
-#include "artifact.h"
+#include "object/artifact.h"
 #include "floor/floor-generate.h"
 #include "dungeon/dungeon.h"
 #include "floor/floor.h"

diff --git a/src/floor/floor.c b/src/floor/floor.c
index df61af4..57c3663 100644 (file)
--- a/src/floor/floor.c
+++ b/src/floor/floor.c
@@ -10,7 +10,7 @@
 #include "world/world.h"
 #include "player/player-effects.h"
 #include "object/object.h"
-#include "artifact.h"
+#include "object/artifact.h"
 #include "object/object-kind.h"
 #include "trap.h"
 #include "effect/spells-effect-util.h"

diff --git a/src/init.c b/src/init.c
index 725f7fd..c3951d7 100644 (file)
--- a/src/init.c
+++ b/src/init.c
@@ -39,7 +39,7 @@
 #include "io/read-pref-file.h"
 #include "gameterm.h"
 
-#include "artifact.h"
+#include "object/artifact.h"
 #include "market/building.h"
 #include "init.h"
 #include "quest.h"

diff --git a/src/inventory/inventory-curse.c b/src/inventory/inventory-curse.c
index e4fb916..40bf7fb 100644 (file)
--- a/src/inventory/inventory-curse.c
+++ b/src/inventory/inventory-curse.c
@@ -8,7 +8,7 @@
 #include "spell/spells3.h"
 #include "files.h"
 #include "object/object-curse.h"
-#include "artifact.h"
+#include "object/artifact.h"
 #include "object/object-hook.h"
 #include "player/player-effects.h"
 #include "object/object-kind.h"

diff --git a/src/io/load.c b/src/io/load.c
index 731e82c..70a9b87 100644 (file)
--- a/src/io/load.c
+++ b/src/io/load.c
@@ -58,7 +58,7 @@
 #include "market/store-util.h"
 #include "quest.h"
 #include "market/store.h"
-#include "artifact.h"
+#include "object/artifact.h"
 #include "avatar.h"
 #include "spell/spells-status.h"
 #include "object/object-hook.h"

diff --git a/src/io/save.c b/src/io/save.c
index 2d992ae..a54c699 100644 (file)
--- a/src/io/save.c
+++ b/src/io/save.c
@@ -18,7 +18,7 @@
 #include "report.h"
 
 #include "core/angband-version.h"
-#include "artifact.h"
+#include "object/artifact.h"
 #include "sort.h"
 #include "dungeon/dungeon.h"
 #include "quest.h"

diff --git a/src/knowledge/knowledge-items.c b/src/knowledge/knowledge-items.c
index 1ab205d..6f14fae 100644 (file)
--- a/src/knowledge/knowledge-items.c
+++ b/src/knowledge/knowledge-items.c
@@ -7,7 +7,7 @@
 #include "system/angband.h"
 #include "knowledge-items.h"
 #include "cmd/dump-util.h"
-#include "artifact.h"
+#include "object/artifact.h"
 #include "sort.h"
 #include "object/object-flavor.h"
 #include "object/object-hook.h"

diff --git a/src/knowledge/knowledge-quests.c b/src/knowledge/knowledge-quests.c
index 997f118..fa71792 100644 (file)
--- a/src/knowledge/knowledge-quests.c
+++ b/src/knowledge/knowledge-quests.c
@@ -9,7 +9,7 @@
 #include "cmd/dump-util.h"
 #include "quest.h"
 #include "system/system-variables.h" // 暫定、init_flagsのため。後で消すかも.
-#include "artifact.h"
+#include "object/artifact.h"
 #include "object/object-flavor.h"
 #include "dungeon/dungeon.h"
 #include "dungeon/dungeon-file.h"

diff --git a/src/market/building.c b/src/market/building.c
index 1367f1c..b803eef 100644 (file)
--- a/src/market/building.c
+++ b/src/market/building.c
@@ -43,7 +43,7 @@
 #include "dungeon/dungeon.h"
 #include "mutation/mutation.h"
 #include "quest.h"
-#include "artifact.h"
+#include "object/artifact.h"
 #include "cmd-spell.h"
 #include "spell/spells3.h"
 #include "spell/spells-object.h"

diff --git a/src/monster/monster-status.c b/src/monster/monster-status.c
index 93fd018..0b6734f 100644 (file)
--- a/src/monster/monster-status.c
+++ b/src/monster/monster-status.c
@@ -19,7 +19,7 @@
 #include "spell/spells-summon.h"
 #include "monster/monsterrace-hook.h"
 #include "object/object-curse.h"
-#include "artifact.h"
+#include "object/artifact.h"
 #include "avatar.h"
 #include "files.h"
 #include "player/player-effects.h"

diff --git a/src/monster/monster1.c b/src/monster/monster1.c
index e4a2c9f..2e783c2 100644 (file)
--- a/src/monster/monster1.c
+++ b/src/monster/monster1.c
@@ -28,7 +28,7 @@
 #include "spell/spells-summon.h"
 #include "patron.h"
 #include "quest.h"
-#include "artifact.h"
+#include "object/artifact.h"
 #include "avatar.h"
 #include "wild.h"
 #include "dungeon/dungeon.h"

diff --git a/src/artifact.c b/src/object/artifact.c
similarity index 99%
rename from src/artifact.c
rename to src/object/artifact.c
index c73d9cc..ecc828c 100644 (file)
--- a/src/artifact.c
+++ b/src/object/artifact.c
@@ -13,7 +13,7 @@
 #include "system/angband.h"
 #include "util.h"
 
-#include "artifact.h"
+#include "object/artifact.h"
 #include "cmd-smith.h"
 
 #include "avatar.h"

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

diff --git a/src/object/object-flavor.c b/src/object/object-flavor.c
index a8617db..071bafe 100644 (file)
--- a/src/object/object-flavor.c
+++ b/src/object/object-flavor.c
@@ -14,7 +14,7 @@
 #include "util.h"
 
 #include "cmd-smith.h"
-#include "artifact.h"
+#include "object/artifact.h"
 #include "player/player-status.h"
 #include "player/player-class.h"
 #include "shoot.h"

diff --git a/src/object/object-hook.c b/src/object/object-hook.c
index 898f570..fc7787a 100644 (file)
--- a/src/object/object-hook.c
+++ b/src/object/object-hook.c
@@ -4,7 +4,7 @@
 
 #include "object/object-hook.h"
 #include "monster/monster.h"
-#include "artifact.h"
+#include "object/artifact.h"
 #include "player/player-class.h"
 #include "player/player-skill.h"
 #include "player/mimic-info-table.h"

diff --git a/src/object/object1.c b/src/object/object1.c
index 0bfedb4..ea8373b 100644 (file)
--- a/src/object/object1.c
+++ b/src/object/object1.c
@@ -16,7 +16,7 @@
 #include "io/read-pref-file.h"
 #include "util.h"
 
-#include "artifact.h"
+#include "object/artifact.h"
 #include "floor/floor.h"
 #include "cmd-activate.h"
 #include "object/object-kind.h"

diff --git a/src/object/object2.c b/src/object/object2.c
index 60d20f9..699b500 100644 (file)
--- a/src/object/object2.c
+++ b/src/object/object2.c
@@ -33,7 +33,7 @@
 #include "object/object-hook.h"
 #include "object/object-curse.h"
 #include "object/object-kind-hook.h"
-#include "artifact.h"
+#include "object/artifact.h"
 #include "feature.h"
 #include "player/player-status.h"
 #include "player/player-move.h"

diff --git a/src/patron.c b/src/patron.c
index 067733b..fefe3e1 100644 (file)
--- a/src/patron.c
+++ b/src/patron.c
@@ -11,7 +11,7 @@
 #include "monster/monsterrace-hook.h"
 #include "object/object-kind-hook.h"
 #include "mutation/mutation.h"
-#include "artifact.h"
+#include "object/artifact.h"
 #include "player/player-status.h"
 #include "player/player-effects.h"
 #include "player/player-race.h"

diff --git a/src/player/player-damage.c b/src/player/player-damage.c
index 384e068..ff81661 100644 (file)
--- a/src/player/player-damage.c
+++ b/src/player/player-damage.c
@@ -13,7 +13,7 @@
 #include "market/arena-info-table.h"
 #include "realm/realm-song.h"
 #include "floor/floor.h"
-#include "artifact.h"
+#include "object/artifact.h"
 #include "object/object-flavor.h"
 #include "object/object-hook.h"
 #include "object/object-broken.h"

diff --git a/src/player/player-effects.c b/src/player/player-effects.c
index 13e027c..6b6ce49 100644 (file)
--- a/src/player/player-effects.c
+++ b/src/player/player-effects.c
@@ -19,7 +19,7 @@
 
 #include "creature.h"
 
-#include "artifact.h"
+#include "object/artifact.h"
 #include "cmd-dump.h"
 #include "floor/floor.h"
 #include "market/building.h"

diff --git a/src/player/player-move.c b/src/player/player-move.c
index 10fc75e..91630b5 100644 (file)
--- a/src/player/player-move.c
+++ b/src/player/player-move.c
@@ -153,7 +153,7 @@
 #include "grid.h"
 #include "trap.h"
 #include "quest.h"
-#include "artifact.h"
+#include "object/artifact.h"
 #include "player/player-move.h"
 #include "player/player-status.h"
 #include "player/player-effects.h"

diff --git a/src/player/player-status.c b/src/player/player-status.c
index b91b181..6f0b824 100644 (file)
--- a/src/player/player-status.c
+++ b/src/player/player-status.c
@@ -17,7 +17,7 @@
 #include "floor/floor.h"
 #include "floor/floor-events.h"
 #include "feature.h"
-#include "artifact.h"
+#include "object/artifact.h"
 #include "avatar.h"
 #include "spell/technic-info-table.h"
 #include "spell/spells-status.h"

diff --git a/src/quest.c b/src/quest.c
index 789cfe2..f18f7ea 100644 (file)
--- a/src/quest.c
+++ b/src/quest.c
@@ -13,7 +13,7 @@
 #include "monster/monster.h"
 #include "player/player-status.h"
 #include "player/player-personality.h"
-#include "artifact.h"
+#include "object/artifact.h"
 #include "feature.h"
 #include "world/world.h"
 #include "io/write-diary.h"

diff --git a/src/realm/realm-hissatsu.c b/src/realm/realm-hissatsu.c
index 0225912..acd66d2 100644 (file)
--- a/src/realm/realm-hissatsu.c
+++ b/src/realm/realm-hissatsu.c
@@ -8,7 +8,7 @@
 #include "effect/effect-characteristics.h"
 #include "melee.h"
 #include "monster/monsterrace-hook.h"
-#include "artifact.h"
+#include "object/artifact.h"
 #include "monster/monster.h"
 #include "player/player-move.h"
 #include "player/player-status.h"

diff --git a/src/rumor.c b/src/rumor.c
index 0b88c69..ff8e3c6 100644 (file)
--- a/src/rumor.c
+++ b/src/rumor.c
@@ -4,7 +4,7 @@
 #include "io/tokenizer.h"
 #include "files.h"
 #include "object/object-flavor.h"
-#include "artifact.h"
+#include "object/artifact.h"
 #include "dungeon/dungeon.h"
 #include "monster/monsterrace.h"
 #include "floor/floor-town.h"

diff --git a/src/sort.c b/src/sort.c
index de557c7..5cdde4b 100644 (file)
--- a/src/sort.c
+++ b/src/sort.c
@@ -2,7 +2,7 @@
 #include "sort.h"
 #include "floor/floor.h"
 #include "quest.h"
-#include "artifact.h"
+#include "object/artifact.h"
 #include "monster/monsterrace.h"
 
 /*

diff --git a/src/spell/mspells4.c b/src/spell/mspells4.c
index 6316636..e5d984a 100644 (file)
--- a/src/spell/mspells4.c
+++ b/src/spell/mspells4.c
@@ -12,7 +12,7 @@
 #include "effect/effect-characteristics.h"
 #include "grid.h"
 #include "spells-summon.h"
-#include "artifact.h"
+#include "object/artifact.h"
 #include "player/player-status.h"
 #include "player/player-class.h"
 #include "player/player-personality.h"

diff --git a/src/spell/spells-floor.c b/src/spell/spells-floor.c
index b40d53e..474d863 100644 (file)
--- a/src/spell/spells-floor.c
+++ b/src/spell/spells-floor.c
@@ -5,7 +5,7 @@
 #include "floor/floor.h"
 #include "grid.h"
 #include "quest.h"
-#include "artifact.h"
+#include "object/artifact.h"
 #include "object/object-kind.h"
 #include "object/object-flavor.h"
 #include "object/object-hook.h"

diff --git a/src/spell/spells-object.c b/src/spell/spells-object.c
index 7af3f30..950bfc3 100644 (file)
--- a/src/spell/spells-object.c
+++ b/src/spell/spells-object.c
@@ -3,7 +3,7 @@
 #include "util.h"
 
 #include "cmd-basic.h"
-#include "artifact.h"
+#include "object/artifact.h"
 #include "floor/floor.h"
 #include "grid.h"
 #include "spell/spells3.h"

diff --git a/src/spell/spells2.c b/src/spell/spells2.c
index 548d87d..6e51b67 100644 (file)
--- a/src/spell/spells2.c
+++ b/src/spell/spells2.c
@@ -19,7 +19,7 @@
 
 #include "creature.h"
 
-#include "artifact.h"
+#include "object/artifact.h"
 #include "io/write-diary.h"
 #include "cmd/cmd-pet.h"
 #include "cmd/cmd-dump.h"

diff --git a/src/spell/spells3.c b/src/spell/spells3.c
index 88fa966..0d99b82 100644 (file)
--- a/src/spell/spells3.c
+++ b/src/spell/spells3.c
@@ -35,7 +35,7 @@
 #include "player-inventory.h"
 #include "spell/spells-summon.h"
 #include "quest.h"
-#include "artifact.h"
+#include "object/artifact.h"
 #include "avatar.h"
 #include "spell/spells2.h"
 #include "spell/spells3.h"

diff --git a/src/trap.c b/src/trap.c
index 3157f95..ae7bc14 100644 (file)
--- a/src/trap.c
+++ b/src/trap.c
@@ -13,7 +13,7 @@
 #include "player/player-personality.h"
 #include "spell/spells-summon.h"
 #include "quest.h"
-#include "artifact.h"
+#include "object/artifact.h"
 #include "feature.h"
 #include "player/player-status.h"
 #include "grid.h"

diff --git a/src/view/display-main-window.c b/src/view/display-main-window.c
index fb8416d..073108b 100644 (file)
--- a/src/view/display-main-window.c
+++ b/src/view/display-main-window.c
@@ -23,7 +23,7 @@
 #include "files.h"
 #include "world/world.h"
 #include "quest.h"
-#include "artifact.h"
+#include "object/artifact.h"
 #include "avatar.h"
 #include "view/display-player.h"
 #include "player/player-status.h"

diff --git a/src/view/status-first-page.c b/src/view/status-first-page.c
index d9b1154..64dc569 100644 (file)
--- a/src/view/status-first-page.c
+++ b/src/view/status-first-page.c
@@ -9,7 +9,7 @@
 #include "gameterm.h"
 #include "status-first-page.h"
 #include "display-util.h"
-#include "artifact.h"
+#include "object/artifact.h"
 #include "combat/melee.h"
 #include "combat/shoot.h"
 #include "object/object-hook.h"

diff --git a/src/warning.c b/src/warning.c
index c1bf5ac..1bdd11d 100644 (file)
--- a/src/warning.c
+++ b/src/warning.c
@@ -2,7 +2,7 @@
 #include "system/angband.h"
 #include "util.h"
 
-#include "artifact.h"
+#include "object/artifact.h"
 #include "player/player-move.h"
 #include "feature.h"
 #include "floor/floor.h"

diff --git a/src/wizard/wizard-special-process.c b/src/wizard/wizard-special-process.c
index 9712bd9..a3bd654 100644 (file)
--- a/src/wizard/wizard-special-process.c
+++ b/src/wizard/wizard-special-process.c
@@ -29,7 +29,7 @@
 #include "patron.h"
 #include "mutation/mutation.h"
 #include "quest.h"
-#include "artifact.h"
+#include "object/artifact.h"
 #include "player/player-status.h"
 #include "player/player-effects.h"
 #include "player/player-skill.h"

diff --git a/src/wizard/wizard-spoiler.c b/src/wizard/wizard-spoiler.c
index 36efd95..90500f0 100644 (file)
--- a/src/wizard/wizard-spoiler.c
+++ b/src/wizard/wizard-spoiler.c
@@ -16,7 +16,7 @@
 #include "gameterm.h"
 
 #include "core/angband-version.h"
-#include "artifact.h"
+#include "object/artifact.h"
 #include "sort.h"
 #include "market/store.h"
 #include "market/store-util.h"