[Refactor] #40906 art-*.h をfixed-art-types.h に統合した / Unified art-*.h into fixed-art...

diff --git a/Hengband/Hengband/Hengband.vcxproj b/Hengband/Hengband/Hengband.vcxproj
index ccbec21..e6a244d 100644 (file)
--- a/Hengband/Hengband/Hengband.vcxproj
+++ b/Hengband/Hengband/Hengband.vcxproj
@@ -798,12 +798,7 @@
     <ClInclude Include="..\..\src\action\travel-execution.h" />\r
     <ClInclude Include="..\..\src\action\tunnel-execution.h" />\r
     <ClInclude Include="..\..\src\action\weapon-shield.h" />\r
-    <ClInclude Include="..\..\src\art-definition\art-accessory-types.h" />\r
-    <ClInclude Include="..\..\src\art-definition\art-armor-types.h" />\r
-    <ClInclude Include="..\..\src\art-definition\art-bow-types.h" />\r
-    <ClInclude Include="..\..\src\art-definition\art-protector-types.h" />\r
-    <ClInclude Include="..\..\src\art-definition\art-sword-types.h" />\r
-    <ClInclude Include="..\..\src\art-definition\art-weapon-types.h" />\r
+    <ClInclude Include="..\..\src\art-definition\fixed-art-types.h" />\r
     <ClInclude Include="..\..\src\art-definition\random-art-effects.h" />\r
     <ClInclude Include="..\..\src\artifact\artifact-info.h" />\r
     <ClInclude Include="..\..\src\artifact\fixed-art-generator.h" />\r

diff --git a/Hengband/Hengband/Hengband.vcxproj.filters b/Hengband/Hengband/Hengband.vcxproj.filters
index 71c158d..fabbd1e 100644 (file)
--- a/Hengband/Hengband/Hengband.vcxproj.filters
+++ b/Hengband/Hengband/Hengband.vcxproj.filters
@@ -3409,24 +3409,6 @@
     <ClInclude Include="..\..\src\object-enchant\trg-types.h">
       <Filter>object-enchant</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\art-definition\art-sword-types.h">
-      <Filter>art-definition</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\art-definition\art-accessory-types.h">
-      <Filter>art-definition</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\art-definition\art-armor-types.h">
-      <Filter>art-definition</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\art-definition\art-protector-types.h">
-      <Filter>art-definition</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\art-definition\art-weapon-types.h">
-      <Filter>art-definition</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\art-definition\art-bow-types.h">
-      <Filter>art-definition</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\object\object-flags.h">
       <Filter>object</Filter>
     </ClInclude>
@@ -4723,6 +4705,9 @@
     <ClInclude Include="..\..\src\io\record-play-movie.h">
       <Filter>io</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\art-definition\fixed-art-types.h">
+      <Filter>art-definition</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\src\wall.bmp" />

diff --git a/src/Makefile.am b/src/Makefile.am
index 83f829d..e021530 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -29,12 +29,7 @@ hengband_SOURCES = \
        artifact/random-art-resistance.c artifact/random-art-resistance.h \
        artifact/random-art-slay.c artifact/random-art-slay.h \
        \
-       art-definition/art-accessory-types.h \
-       art-definition/art-armor-types.h \
-       art-definition/art-bow-types.h \
-       art-definition/art-protector-types.h \
-       art-definition/art-sword-types.h \
-       art-definition/art-weapon-types.h \
+       art-definition/fixed-art-types.h
        art-definition/random-art-effects.h \
        \
        autopick/autopick.c autopick/autopick.h \

diff --git a/src/action/movement-execution.c b/src/action/movement-execution.c
index cf965fc..ee28085 100644 (file)
--- a/src/action/movement-execution.c
+++ b/src/action/movement-execution.c
@@ -1,6 +1,6 @@
 #include "action/movement-execution.h"
 #include "action/open-close-execution.h"
-#include "art-definition/art-sword-types.h"
+#include "art-definition/fixed-art-types.h"
 #include "cmd-action/cmd-attack.h"
 #include "core/disturbance.h"
 #include "core/player-update-types.h"

diff --git a/src/art-definition/art-accessory-types.h b/src/art-definition/art-accessory-types.h
deleted file mode 100644 (file)
index 8bbbd83..0000000
--- a/src/art-definition/art-accessory-types.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#pragma once
-
-typedef enum art_lite_type {
-    ART_JUDGE = 3,
-} art_lite_type;
-
-typedef enum art_amulet_type {
-    ART_NIGHT = 215,
-} art_amulet_type;
-
-typedef enum art_ring_type {
-    ART_POWER = 13,
-} art_ring_type;

diff --git a/src/art-definition/art-armor-types.h b/src/art-definition/art-armor-types.h
deleted file mode 100644 (file)
index fb5533d..0000000
--- a/src/art-definition/art-armor-types.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#pragma once
-
-typedef enum art_soft_armor_type {
-    ART_NAMAKE_ARMOR = 183,
-    ART_GHB = 192,
-    ART_MILIM = 246,
-} art_soft_armor_type;

diff --git a/src/art-definition/art-bow-types.h b/src/art-definition/art-bow-types.h
deleted file mode 100644 (file)
index af349d3..0000000
--- a/src/art-definition/art-bow-types.h
+++ /dev/null
@@ -1,11 +0,0 @@
-#pragma once
-
-typedef enum art_bow_type {
-       ART_CRIMSON = 16,
-    ART_BARD = 125,
-    ART_NAMAKE_BOW = 182,
-} art_bow_type;
-
-typedef enum art_arrow_type {
-    ART_BARD_ARROW = 153,
-} art_bow_type;

diff --git a/src/art-definition/art-protector-types.h b/src/art-definition/art-protector-types.h
deleted file mode 100644 (file)
index d9aa303..0000000
--- a/src/art-definition/art-protector-types.h
+++ /dev/null
@@ -1,11 +0,0 @@
-#pragma once
-
-typedef enum art_helm_type {
-    ART_CHAOS = 34,
-    ART_TERROR = 41,
-    ART_STONEMASK = 146,
-} art_helm_type;
-
-typedef enum art_cloak_type {
-    ART_HEAVENLY_MAIDEN = 233,
-} art_cloak_type;

diff --git a/src/art-definition/art-sword-types.h b/src/art-definition/art-sword-types.h
deleted file mode 100644 (file)
index 0910130..0000000
--- a/src/art-definition/art-sword-types.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#pragma once
-
-typedef enum artifact_sword_type {
-    ART_NOTHUNG = 74,
-    ART_CHAINSWORD = 85,
-    ART_VORPAL_BLADE = 92,
-    ART_MURAMASA = 144,
-    ART_ZANTETSU = 150,
-    ART_MUSASI_KATANA = 171,
-    ART_MUSASI_WAKIZASI = 172,
-    ART_QUICKTHORN = 174,
-    ART_TINYTHORN = 175,
-    ART_EXCALIBUR_J = 179,
-    ART_STORMBRINGER = 190,
-    ART_NARSIL = 191,
-    ART_ROBINTON = 251,
-} artifact_sword_type;

diff --git a/src/art-definition/art-weapon-types.h b/src/art-definition/art-weapon-types.h
deleted file mode 100644 (file)
index f76902d..0000000
--- a/src/art-definition/art-weapon-types.h
+++ /dev/null
@@ -1,19 +0,0 @@
-#pragma once
-
-/* Digging */
-#define ART_NAIN 211
-
-typedef enum art_polearm_type {
-    ART_BLOOD = 199,
-} art_polearm_type;
-
-typedef enum art_hafted_type {
-    ART_GROND = 111,
-    ART_MJOLLNIR = 136,
-    ART_XIAOLONG = 145,
-    ART_HYOUSIGI = 169,
-    ART_IRON_BALL = 173,
-    ART_NAMAKE_HAMMER = 181,
-    ART_G_HAMMER = 195,
-    ART_AEGISFANG = 208,
-} art_hafted_type;

diff --git a/src/art-definition/fixed-art-types.h b/src/art-definition/fixed-art-types.h
new file mode 100644 (file)
index 0000000..2d76317
--- /dev/null
+++ b/src/art-definition/fixed-art-types.h
@@ -0,0 +1,40 @@
+#pragma once
+
+typedef enum artifact_kind_type {
+    ART_JUDGE = 3,
+    ART_POWER = 13,
+    ART_CRIMSON = 16,
+    ART_CHAOS = 34,
+    ART_TERROR = 41,
+    ART_NOTHUNG = 74,
+    ART_CHAINSWORD = 85,
+    ART_VORPAL_BLADE = 92,
+    ART_GROND = 111,
+    ART_BARD = 125,
+    ART_MJOLLNIR = 136,
+    ART_MURAMASA = 144,
+    ART_XIAOLONG = 145,
+    ART_STONEMASK = 146,
+    ART_ZANTETSU = 150,
+    ART_BARD_ARROW = 153,
+    ART_HYOUSIGI = 169,
+    ART_MUSASI_KATANA = 171,
+    ART_MUSASI_WAKIZASI = 172,
+    ART_IRON_BALL = 173,
+    ART_QUICKTHORN = 174,
+    ART_TINYTHORN = 175,
+    ART_EXCALIBUR_J = 179,
+    ART_NAMAKE_HAMMER = 181,
+    ART_NAMAKE_BOW = 182,
+    ART_NAMAKE_ARMOR = 183,
+    ART_STORMBRINGER = 190,
+    ART_NARSIL = 191,
+    ART_GHB = 192,
+    ART_G_HAMMER = 195,
+    ART_BLOOD = 199,
+    ART_AEGISFANG = 208,
+    ART_NIGHT = 215,
+    ART_HEAVENLY_MAIDEN = 233,
+    ART_MILIM = 246,
+    ART_ROBINTON = 251,
+} artifact_kind_type;

diff --git a/src/artifact/fixed-art-generator.c b/src/artifact/fixed-art-generator.c
index 3364ded..2cfb2f7 100644 (file)
--- a/src/artifact/fixed-art-generator.c
+++ b/src/artifact/fixed-art-generator.c
@@ -11,10 +11,7 @@
  */
 
 #include "artifact/fixed-art-generator.h"
-#include "art-definition/art-armor-types.h"
-#include "art-definition/art-protector-types.h"
-#include "art-definition/art-sword-types.h"
-#include "art-definition/art-weapon-types.h"
+#include "art-definition/fixed-art-types.h"
 #include "floor/floor-object.h"
 #include "object-enchant/object-boost.h"
 #include "object-enchant/object-curse.h"

diff --git a/src/cmd-action/cmd-attack.c b/src/cmd-action/cmd-attack.c
index 5e25d74..c5137ad 100644 (file)
--- a/src/cmd-action/cmd-attack.c
+++ b/src/cmd-action/cmd-attack.c
@@ -5,7 +5,7 @@
  */
 
 #include "cmd-action/cmd-attack.h"
-#include "art-definition/art-sword-types.h"
+#include "art-definition/fixed-art-types.h"
 #include "combat/attack-accuracy.h"
 #include "combat/attack-criticality.h"
 #include "core/asking-player.h"

diff --git a/src/cmd-item/cmd-equipment.c b/src/cmd-item/cmd-equipment.c
index c48705b..ed59dba 100644 (file)
--- a/src/cmd-item/cmd-equipment.c
+++ b/src/cmd-item/cmd-equipment.c
@@ -1,6 +1,6 @@
 #include "cmd-item/cmd-equipment.h"
 #include "action/weapon-shield.h"
-#include "art-definition/art-protector-types.h"
+#include "art-definition/fixed-art-types.h"
 #include "autopick/autopick.h"
 #include "core/asking-player.h"
 #include "core/player-redraw-types.h"

diff --git a/src/cmd-item/cmd-throw.c b/src/cmd-item/cmd-throw.c
index fdeada1..187462d 100644 (file)
--- a/src/cmd-item/cmd-throw.c
+++ b/src/cmd-item/cmd-throw.c
@@ -1,7 +1,7 @@
 #include "cmd-item/cmd-throw.h"
 #include "action/throw-util.h"
 #include "action/weapon-shield.h"
-#include "art-definition/art-weapon-types.h"
+#include "art-definition/fixed-art-types.h"
 #include "combat/attack-power-table.h"
 #include "combat/shoot.h"
 #include "combat/slaying.h"

diff --git a/src/combat/shoot.c b/src/combat/shoot.c
index fe4e969..b739652 100644 (file)
--- a/src/combat/shoot.c
+++ b/src/combat/shoot.c
@@ -1,5 +1,5 @@
 #include "combat/shoot.h"
-#include "art-definition/art-bow-types.h"
+#include "art-definition/fixed-art-types.h"
 #include "core/player-redraw-types.h"
 #include "core/player-update-types.h"
 #include "core/stuff-handler.h"

diff --git a/src/combat/slaying.c b/src/combat/slaying.c
index b135eca..2bd1044 100644 (file)
--- a/src/combat/slaying.c
+++ b/src/combat/slaying.c
@@ -1,5 +1,5 @@
 #include "combat/slaying.h"
-#include "art-definition/art-sword-types.h"
+#include "art-definition/fixed-art-types.h"
 #include "core/player-redraw-types.h"
 #include "mind/mind-samurai.h"
 #include "monster-race/monster-race.h"

diff --git a/src/effect/effect-player-resist-hurt.c b/src/effect/effect-player-resist-hurt.c
index 54b8369..d7a9464 100644 (file)
--- a/src/effect/effect-player-resist-hurt.c
+++ b/src/effect/effect-player-resist-hurt.c
@@ -1,5 +1,5 @@
 #include "effect/effect-player-resist-hurt.h"
-#include "art-definition/art-sword-types.h"
+#include "art-definition/fixed-art-types.h"
 #include "blue-magic/blue-magic-checker.h"
 #include "core/hp-mp-processor.h"
 #include "core/player-redraw-types.h"

diff --git a/src/inventory/inventory-curse.c b/src/inventory/inventory-curse.c
index a6abaa9..2d727d4 100644 (file)
--- a/src/inventory/inventory-curse.c
+++ b/src/inventory/inventory-curse.c
@@ -1,5 +1,5 @@
 #include "inventory/inventory-curse.h"
-#include "art-definition/art-accessory-types.h"
+#include "art-definition/fixed-art-types.h"
 #include "core/asking-player.h"
 #include "core/disturbance.h"
 #include "core/player-redraw-types.h"

diff --git a/src/inventory/player-inventory.c b/src/inventory/player-inventory.c
index 9265122..d30f837 100644 (file)
--- a/src/inventory/player-inventory.c
+++ b/src/inventory/player-inventory.c
@@ -32,7 +32,7 @@
 #include "view/display-messages.h"
 #include "world/world.h"
 #ifdef JP
-#include "art-definition/art-bow-types.h"
+#include "art-definition/fixed-art-types.h"
 #include "flavor/flavor-util.h"
 #endif
 

diff --git a/src/io-dump/character-dump.c b/src/io-dump/character-dump.c
index ee5c1eb..b0c9e8c 100644 (file)
--- a/src/io-dump/character-dump.c
+++ b/src/io-dump/character-dump.c
@@ -1,5 +1,5 @@
 #include "io-dump/character-dump.h"
-#include "art-definition/art-bow-types.h"
+#include "art-definition/fixed-art-types.h"
 #include "cmd-building/cmd-building.h"
 #include "dungeon/dungeon.h"
 #include "dungeon/quest.h"

diff --git a/src/load/item-loader.c b/src/load/item-loader.c
index 549266c..f7fd014 100644 (file)
--- a/src/load/item-loader.c
+++ b/src/load/item-loader.c
@@ -1,5 +1,5 @@
 #include "load/item-loader.h"
-#include "art-definition/art-accessory-types.h"
+#include "art-definition/fixed-art-types.h"
 #include "game-option/runtime-arguments.h"
 #include "load/angband-version-comparer.h"
 #include "load/load-v1-5-0.h"

diff --git a/src/market/building-craft-fix.c b/src/market/building-craft-fix.c
index 39ad475..ef3d42d 100644 (file)
--- a/src/market/building-craft-fix.c
+++ b/src/market/building-craft-fix.c
@@ -1,6 +1,6 @@
 #include "market/building-craft-fix.h"
 #include "artifact/artifact-info.h"
-#include "art-definition/art-sword-types.h"
+#include "art-definition/fixed-art-types.h"
 #include "core/asking-player.h"
 #include "core/player-update-types.h"
 #include "core/stuff-handler.h"

diff --git a/src/market/building-craft-weapon.c b/src/market/building-craft-weapon.c
index c8bb4ac..3569f37 100644 (file)
--- a/src/market/building-craft-weapon.c
+++ b/src/market/building-craft-weapon.c
@@ -1,5 +1,5 @@
 #include "market/building-craft-weapon.h"
-#include "art-definition/art-sword-types.h"
+#include "art-definition/fixed-art-types.h"
 #include "combat/attack-accuracy.h"
 #include "combat/shoot.h"
 #include "core/player-update-types.h"

diff --git a/src/monster-floor/special-death-switcher.c b/src/monster-floor/special-death-switcher.c
index b8f1134..c45eac1 100644 (file)
--- a/src/monster-floor/special-death-switcher.c
+++ b/src/monster-floor/special-death-switcher.c
@@ -5,10 +5,7 @@
  */
 
 #include "monster-floor/special-death-switcher.h"
-#include "art-definition/art-armor-types.h"
-#include "art-definition/art-bow-types.h"
-#include "art-definition/art-protector-types.h"
-#include "art-definition/art-weapon-types.h"
+#include "art-definition/fixed-art-types.h"
 #include "artifact/fixed-art-generator.h"
 #include "effect/effect-characteristics.h"
 #include "effect/effect-processor.h"

diff --git a/src/object-activation/activation-others.c b/src/object-activation/activation-others.c
index 6f4a2b3..89fb6eb 100644 (file)
--- a/src/object-activation/activation-others.c
+++ b/src/object-activation/activation-others.c
@@ -5,7 +5,7 @@
  */
 
 #include "object-activation/activation-others.h"
-#include "art-definition/art-weapon-types.h"
+#include "art-definition/fixed-art-types.h"
 #include "cmd-io/cmd-save.h"
 #include "core/asking-player.h"
 #include "core/hp-mp-processor.h"

diff --git a/src/object-enchant/apply-magic.c b/src/object-enchant/apply-magic.c
index 61007c9..62ffff1 100644 (file)
--- a/src/object-enchant/apply-magic.c
+++ b/src/object-enchant/apply-magic.c
@@ -7,7 +7,7 @@
 
 #include "object-enchant/apply-magic.h"
 #include "artifact/fixed-art-generator.h"
-#include "art-definition/art-armor-types.h"
+#include "art-definition/fixed-art-types.h"
 #include "dungeon/dungeon.h"
 #include "mutation/mutation-flag-types.h"
 #include "object-enchant/apply-magic-accessory.h"

diff --git a/src/object-enchant/vorpal-weapon.c b/src/object-enchant/vorpal-weapon.c
index d5de6f7..3ecd0c2 100644 (file)
--- a/src/object-enchant/vorpal-weapon.c
+++ b/src/object-enchant/vorpal-weapon.c
@@ -1,5 +1,5 @@
 #include "object-enchant/vorpal-weapon.h"
-#include "art-definition/art-sword-types.h"
+#include "art-definition/fixed-art-types.h"
 #include "inventory/inventory-slot-types.h"
 #include "io/files-util.h"
 #include "monster-race/monster-race.h"

diff --git a/src/object-hook/hook-expendable.c b/src/object-hook/hook-expendable.c
index 41102aa..321be27 100644 (file)
--- a/src/object-hook/hook-expendable.c
+++ b/src/object-hook/hook-expendable.c
@@ -1,6 +1,5 @@
 #include "object-hook/hook-expendable.h"
-#include "art-definition/art-accessory-types.h"
-#include "art-definition/art-armor-types.h"
+#include "art-definition/fixed-art-types.h"
 #include "core/player-update-types.h"
 #include "core/window-redrawer.h"
 #include "monster-race/monster-race.h"

diff --git a/src/object-use/read-execution.c b/src/object-use/read-execution.c
index b63e1c6..f612b40 100644 (file)
--- a/src/object-use/read-execution.c
+++ b/src/object-use/read-execution.c
@@ -7,8 +7,7 @@
 
 #include "object-use/read-execution.h"
 #include "action/action-limited.h"
-#include "art-definition/art-accessory-types.h"
-#include "art-definition/art-armor-types.h"
+#include "art-definition/fixed-art-types.h"
 #include "core/player-redraw-types.h"
 #include "core/player-update-types.h"
 #include "core/show-file.h"

diff --git a/src/object/object-info.c b/src/object/object-info.c
index 74bbff4..fdfefd2 100644 (file)
--- a/src/object/object-info.c
+++ b/src/object/object-info.c
@@ -12,7 +12,7 @@
 
 #include "object/object-info.h"
 #include "artifact/artifact-info.h"
-#include "art-definition/art-weapon-types.h"
+#include "art-definition/fixed-art-types.h"
 #include "art-definition/random-art-effects.h"
 #include "inventory/inventory-slot-types.h"
 #include "monster-race/monster-race.h"

diff --git a/src/object/warning.c b/src/object/warning.c
index 7aa7935..b9e30e4 100644 (file)
--- a/src/object/warning.c
+++ b/src/object/warning.c
@@ -1,5 +1,5 @@
 #include "object/warning.h"
-#include "art-definition/art-sword-types.h"
+#include "art-definition/fixed-art-types.h"
 #include "core/asking-player.h"
 #include "core/disturbance.h"
 #include "dungeon/dungeon-flag-types.h"

diff --git a/src/perception/identification.c b/src/perception/identification.c
index fff6bcc..4f0bd9d 100644 (file)
--- a/src/perception/identification.c
+++ b/src/perception/identification.c
@@ -1,5 +1,5 @@
 #include "perception/identification.h"
-#include "art-definition/art-protector-types.h"
+#include "art-definition/fixed-art-types.h"
 #include "flavor/flavor-describer.h"
 #include "flavor/object-flavor-types.h"
 #include "game-option/special-options.h"

diff --git a/src/player-attack/attack-chaos-effect.c b/src/player-attack/attack-chaos-effect.c
index 1e281ed..d438b49 100644 (file)
--- a/src/player-attack/attack-chaos-effect.c
+++ b/src/player-attack/attack-chaos-effect.c
@@ -6,7 +6,7 @@
  */
 
 #include "player-attack/attack-chaos-effect.h"
-#include "art-definition/art-weapon-types.h"
+#include "art-definition/fixed-art-types.h"
 #include "core/player-redraw-types.h"
 #include "flavor/flavor-describer.h"
 #include "flavor/object-flavor-types.h"

diff --git a/src/player-attack/blood-sucking-processor.c b/src/player-attack/blood-sucking-processor.c
index ec898e9..669c818 100644 (file)
--- a/src/player-attack/blood-sucking-processor.c
+++ b/src/player-attack/blood-sucking-processor.c
@@ -5,7 +5,7 @@
  */
 
 #include "player-attack/blood-sucking-processor.h"
-#include "art-definition/art-sword-types.h"
+#include "art-definition/fixed-art-types.h"
 #include "core/hp-mp-processor.h"
 #include "game-option/cheat-options.h"
 #include "inventory/inventory-slot-types.h"

diff --git a/src/player-attack/player-attack.c b/src/player-attack/player-attack.c
index f510680..b37c078 100644 (file)
--- a/src/player-attack/player-attack.c
+++ b/src/player-attack/player-attack.c
@@ -5,7 +5,7 @@
  */
 
 #include "player-attack/player-attack.h"
-#include "art-definition/art-sword-types.h"
+#include "art-definition/fixed-art-types.h"
 #include "cmd-action/cmd-attack.h"
 #include "combat/attack-accuracy.h"
 #include "combat/attack-criticality.h"

diff --git a/src/player/player-status-flags.c b/src/player/player-status-flags.c
index bb437ec..a05983e 100644 (file)
--- a/src/player/player-status-flags.c
+++ b/src/player/player-status-flags.c
@@ -1,5 +1,5 @@
 #include "player/player-status-flags.h"
-#include "art-definition/art-sword-types.h"
+#include "art-definition/fixed-art-types.h"
 #include "grid/grid.h"
 #include "inventory/inventory-slot-types.h"
 #include "monster-race/monster-race.h"

diff --git a/src/player/player-status-resist.c b/src/player/player-status-resist.c
index 9c740d0..9435d3c 100644 (file)
--- a/src/player/player-status-resist.c
+++ b/src/player/player-status-resist.c
@@ -1,6 +1,6 @@
 #include "player/player-status-resist.h"
 #include "player/mimic-info-table.h"
-#include "art-definition/art-sword-types.h"
+#include "art-definition/fixed-art-types.h"
 #include "grid/grid.h"
 #include "inventory/inventory-slot-types.h"
 #include "monster-race/monster-race.h"

diff --git a/src/player/player-status.c b/src/player/player-status.c
index 928662b..097d6c6 100644 (file)
--- a/src/player/player-status.c
+++ b/src/player/player-status.c
@@ -1,7 +1,5 @@
 #include "player/player-status.h"
-#include "art-definition/art-bow-types.h"
-#include "art-definition/art-sword-types.h"
-#include "art-definition/art-weapon-types.h"
+#include "art-definition/fixed-art-types.h"
 #include "autopick/autopick-reader-writer.h"
 #include "autopick/autopick.h"
 #include "cmd-action/cmd-pet.h"

diff --git a/src/realm/realm-hissatsu.c b/src/realm/realm-hissatsu.c
index ad0dca6..67e6d3f 100644 (file)
--- a/src/realm/realm-hissatsu.c
+++ b/src/realm/realm-hissatsu.c
@@ -1,5 +1,5 @@
 #include "realm/realm-hissatsu.h"
-#include "art-definition/art-sword-types.h"
+#include "art-definition/fixed-art-types.h"
 #include "cmd-action/cmd-attack.h"
 #include "cmd-action/cmd-spell.h"
 #include "cmd-item/cmd-throw.h"

diff --git a/src/specific-object/bloody-moon.c b/src/specific-object/bloody-moon.c
index 0e34216..7990c54 100644 (file)
--- a/src/specific-object/bloody-moon.c
+++ b/src/specific-object/bloody-moon.c
@@ -1,5 +1,5 @@
 #include "specific-object/bloody-moon.h"
-#include "art-definition/art-weapon-types.h"
+#include "art-definition/fixed-art-types.h"
 #include "core/player-update-types.h"
 #include "object-enchant/object-boost.h"
 #include "object-enchant/tr-types.h"

diff --git a/src/specific-object/death-crimson.c b/src/specific-object/death-crimson.c
index e4addc4..f02822a 100644 (file)
--- a/src/specific-object/death-crimson.c
+++ b/src/specific-object/death-crimson.c
@@ -1,5 +1,5 @@
 #include "specific-object/death-crimson.h"
-#include "art-definition/art-bow-types.h"
+#include "art-definition/fixed-art-types.h"
 #include "effect/effect-characteristics.h"
 #include "effect/effect-processor.h"
 #include "floor/geometry.h"

diff --git a/src/specific-object/muramasa.c b/src/specific-object/muramasa.c
index c203ded..e492315 100644 (file)
--- a/src/specific-object/muramasa.c
+++ b/src/specific-object/muramasa.c
@@ -1,6 +1,6 @@
 #include "specific-object/muramasa.h"
 #include "core/asking-player.h"
-#include "art-definition/art-sword-types.h"
+#include "art-definition/fixed-art-types.h"
 #include "spell/spells-object.h"
 #include "status/base-status.h"
 #include "system/object-type-definition.h"

diff --git a/src/view/status-first-page.c b/src/view/status-first-page.c
index e9729bc..2d7699e 100644 (file)
--- a/src/view/status-first-page.c
+++ b/src/view/status-first-page.c
@@ -6,8 +6,7 @@
  */
 
 #include "view/status-first-page.h"
-#include "art-definition/art-bow-types.h"
-#include "art-definition/art-sword-types.h"
+#include "art-definition/fixed-art-types.h"
 #include "combat/attack-power-table.h"
 #include "combat/shoot.h"
 #include "display-util.h"