[Refactor] Separated art-armor-types.h from artifact.h

diff --git a/Hengband/Hengband/Hengband.vcxproj b/Hengband/Hengband/Hengband.vcxproj
index d08ed00..9a3fb11 100644 (file)
--- a/Hengband/Hengband/Hengband.vcxproj
+++ b/Hengband/Hengband/Hengband.vcxproj
@@ -483,6 +483,7 @@
     <ClCompile Include="..\..\src\spell\technic-info-table.c" />\r
     <ClCompile Include="..\..\src\combat\aura-counterattack.c" />\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-sword-types.h" />\r
     <ClInclude Include="..\..\src\birth\auto-roller.h" />\r
     <ClInclude Include="..\..\src\birth\birth-body-spec.h" />\r

diff --git a/Hengband/Hengband/Hengband.vcxproj.filters b/Hengband/Hengband/Hengband.vcxproj.filters
index e7af79e..0184f19 100644 (file)
--- a/Hengband/Hengband/Hengband.vcxproj.filters
+++ b/Hengband/Hengband/Hengband.vcxproj.filters
@@ -2650,6 +2650,9 @@
     <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>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\src\wall.bmp" />

diff --git a/src/Makefile.am b/src/Makefile.am
index 7791cdc..11d5e34 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -5,7 +5,8 @@ AUTOMAKE_OPTIONS = foreign subdir-objects
 bin_PROGRAMS = hengband
 
 hengband_SOURCES = \
-       art-definition/art-accessory.h \
+       art-definition/art-accessory-types.h \
+       art-definition/art-armor-types.h \
        art-definition/art-sword-types.h \
        \
        autopick/autopick.c autopick/autopick.h \

diff --git a/src/art-definition/art-armor-types.h b/src/art-definition/art-armor-types.h
new file mode 100644 (file)
index 0000000..f328ce1
--- /dev/null
+++ b/src/art-definition/art-armor-types.h
@@ -0,0 +1,33 @@
+#pragma once
+
+typedef enum art_dragon_armor_type {
+       ART_RAZORBACK = 129,
+    ART_BLADETURNER = 130,
+    ART_SEIRYU = 201,
+} art_dragon_type;
+
+typedef enum art_hard_armor_type {
+    ART_SOULKEEPER = 19,
+    ART_ISILDUR = 20,
+    ART_ROHIRRIM = 21,
+    ART_LOHENGRIN = 22,
+    ART_JULIAN = 23,
+    ART_ARVEDUI = 24,
+    ART_CASPANION = 25,
+    ART_GILES = 168,
+    ART_MORLOK = 203,
+    ART_VETERAN = 206,
+} art_hard_armor_type;
+
+typedef enum art_soft_armor_type {
+    ART_SHIVA_JACKET = 26,
+    ART_HITHLOMIR = 27,
+    ART_THALKETTOTH = 28,
+    ART_HIMRING = 127,
+    ART_ICANUS = 131,
+    ART_NAMAKE_ARMOR = 183,
+    ART_GHB = 192,
+    ART_DASAI = 200,
+    ART_KESHO = 204,
+    ART_MILIM = 246,
+} art_soft_armor_type;

diff --git a/src/cmd-item/cmd-read.c b/src/cmd-item/cmd-read.c
index 1e91b9e..80915ae 100644 (file)
--- a/src/cmd-item/cmd-read.c
+++ b/src/cmd-item/cmd-read.c
@@ -6,6 +6,7 @@
 
 #include "cmd-item/cmd-read.h"
 #include "art-definition/art-accessory-types.h"
+#include "art-definition/art-armor-types.h"
 #include "cmd/cmd-basic.h"
 #include "core/show-file.h"
 #include "floor/floor.h"
@@ -13,7 +14,6 @@
 #include "inventory/player-inventory.h"
 #include "io/files-util.h"
 #include "main/sound-definitions-table.h"
-#include "object-enchant/artifact.h"
 #include "object/item-use-flags.h"
 #include "perception/object-perception.h"
 #include "object/object-flavor.h"

diff --git a/src/monster/monster1.c b/src/monster/monster1.c
index d2ac886..74ec863 100644 (file)
--- a/src/monster/monster1.c
+++ b/src/monster/monster1.c
@@ -11,6 +11,7 @@
  */
 
 #include "system/angband.h"
+#include "art-definition/art-armor-types.h"
 #include "util/util.h"
 #include "main/music-definitions-table.h"
 #include "term/term-color-types.h"

diff --git a/src/object-enchant/apply-magic.c b/src/object-enchant/apply-magic.c
index fe9dc63..1872626 100644 (file)
--- a/src/object-enchant/apply-magic.c
+++ b/src/object-enchant/apply-magic.c
@@ -6,6 +6,7 @@
  */
 
 #include "object-enchant/apply-magic.h"
+#include "art-definition/art-armor-types.h"
 #include "dungeon/dungeon.h"
 #include "floor/floor.h"
 #include "object-enchant/apply-magic-accessory.h"

diff --git a/src/object-enchant/artifact.c b/src/object-enchant/artifact.c
index 93b6295..f55cf65 100644 (file)
--- a/src/object-enchant/artifact.c
+++ b/src/object-enchant/artifact.c
@@ -11,6 +11,7 @@
  */
 
 #include "object-enchant/artifact.h"
+#include "art-definition/art-armor-types.h"
 #include "art-definition/art-sword-types.h"
 #include "cmd-item/cmd-activate.h"
 #include "cmd-item/cmd-smith.h"

diff --git a/src/object-enchant/artifact.h b/src/object-enchant/artifact.h
index b1c2622..101d9a7 100644 (file)
--- a/src/object-enchant/artifact.h
+++ b/src/object-enchant/artifact.h
@@ -48,35 +48,6 @@ bool create_named_art(player_type *player_ptr, ARTIFACT_IDX a_idx, POSITION y, P
 bool make_artifact(player_type *player_ptr, object_type *o_ptr);
 bool make_artifact_special(player_type *player_ptr, object_type *o_ptr);
 
-/* Dragon Scale */
-#define ART_RAZORBACK           129
-#define ART_BLADETURNER         130
-#define ART_SEIRYU              201
-
-/* Hard Armour */
-#define ART_SOULKEEPER          19
-#define ART_ISILDUR             20
-#define ART_ROHIRRIM            21
-#define ART_LOHENGRIN           22
-#define ART_JULIAN              23
-#define ART_ARVEDUI             24
-#define ART_CASPANION           25
-#define ART_GILES               168
-#define ART_MORLOK              203
-#define ART_VETERAN             206
-
-/* Soft Armour */
-#define ART_SHIVA_JACKET        26
-#define ART_HITHLOMIR           27
-#define ART_THALKETTOTH         28
-#define ART_HIMRING             127
-#define ART_ICANUS              131
-#define ART_NAMAKE_ARMOR        183
-#define ART_GHB                 192
-#define ART_DASAI               200
-#define ART_KESHO               204
-#define ART_MILIM               246
-
 /* Shields */
 #define ART_THORIN              30
 #define ART_CELEGORM            31

diff --git a/src/object/object-hook.c b/src/object/object-hook.c
index 89f0517..a05f6f7 100644 (file)
--- a/src/object/object-hook.c
+++ b/src/object/object-hook.c
@@ -6,6 +6,7 @@
 
 #include "object/object-hook.h"
 #include "art-definition/art-accessory-types.h"
+#include "art-definition/art-armor-types.h"
 #include "dungeon/quest.h"
 #include "floor/floor.h"
 #include "monster/monster.h"