[Refactor] #40399 Separated sv-wand-types.h from object.h

diff --git a/Hengband/Hengband/Hengband.vcxproj b/Hengband/Hengband/Hengband.vcxproj
index 0c3c805..9fb8aeb 100644 (file)
--- a/Hengband/Hengband/Hengband.vcxproj
+++ b/Hengband/Hengband/Hengband.vcxproj
@@ -518,6 +518,7 @@
     <ClInclude Include="..\..\src\object\sv-protector-types.h" />\r
     <ClInclude Include="..\..\src\object\sv-ring-types.h" />\r
     <ClInclude Include="..\..\src\object\sv-staff-types.h" />\r
+    <ClInclude Include="..\..\src\object\sv-wand-types.h" />\r
     <ClInclude Include="..\..\src\object\sv-weapon-types.h" />\r
     <ClInclude Include="..\..\src\object\tr-types.h" />\r
     <ClInclude Include="..\..\src\object\trc-types.h" />\r

diff --git a/Hengband/Hengband/Hengband.vcxproj.filters b/Hengband/Hengband/Hengband.vcxproj.filters
index b91c7b1..e11444a 100644 (file)
--- a/Hengband/Hengband/Hengband.vcxproj.filters
+++ b/Hengband/Hengband/Hengband.vcxproj.filters
@@ -2203,6 +2203,9 @@
     <ClInclude Include="..\..\src\object\sv-staff-types.h">
       <Filter>object</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\object\sv-wand-types.h">
+      <Filter>object</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\src\wall.bmp" />

diff --git a/src/Makefile.am b/src/Makefile.am
index 7e8eab4..45fedbf 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -212,7 +212,7 @@ hengband_SOURCES = \
        object/sv-digging-types.h \
        object/sv-weapon-types.h object/sv-protector-types.h object/sv-armor-types.h \
        object/sv-lite-types.h object/sv-potion-types.h object/sv-ring-types.h \
-       object/sv-staff-types.h object/sv-other-types.h \
+       object/sv-staff-types.h object/sv-wand-types.h object/sv-other-types.h \
        object/item-feeling.h object/item-use-flags.h \
        \
        inventory/simple-appraiser.c inventory/simple-appraiser.h \

diff --git a/src/autopick/autopick-destroyer.c b/src/autopick/autopick-destroyer.c
index c944a75..9e22ac5 100644 (file)
--- a/src/autopick/autopick-destroyer.c
+++ b/src/autopick/autopick-destroyer.c
@@ -14,6 +14,7 @@
 #include "object/object-flavor.h"
 #include "object/object-mark-types.h"
 #include "object/special-object-flags.h"
+#include "object/sv-wand-types.h"
 #include "player/player-move.h"
 #include "player/player-races-table.h"
 

diff --git a/src/birth/initial-equipments-table.c b/src/birth/initial-equipments-table.c
index f489d45..363fe90 100644 (file)
--- a/src/birth/initial-equipments-table.c
+++ b/src/birth/initial-equipments-table.c
@@ -4,6 +4,7 @@
 #include "object/sv-bow-types.h"
 #include "object/sv-potion-types.h"
 #include "object/sv-ring-types.h"
+#include "object/sv-wand-types.h"
 #include "object/sv-weapon-types.h"
 
 /*!

diff --git a/src/birth/inventory-initializer.c b/src/birth/inventory-initializer.c
index c31915d..f8ef34f 100644 (file)
--- a/src/birth/inventory-initializer.c
+++ b/src/birth/inventory-initializer.c
@@ -12,6 +12,7 @@
 #include "object/sv-potion-types.h"
 #include "object/sv-ring-types.h"
 #include "object/sv-staff-types.h"
+#include "object/sv-wand-types.h"
 #include "object/sv-weapon-types.h"
 #include "autopick/autopick.h"
 #include "player/player-races-table.h"

diff --git a/src/cmd/cmd-zapwand.c b/src/cmd/cmd-zapwand.c
index ca16b37..6fa58d2 100644 (file)
--- a/src/cmd/cmd-zapwand.c
+++ b/src/cmd/cmd-zapwand.c
@@ -13,6 +13,7 @@
 #include "object/object-kind.h"
 #include "object/object-hook.h"
 #include "object/special-object-flags.h"
+#include "object/sv-wand-types.h"
 #include "cmd-basic.h"
 #include "floor/floor.h"
 #include "io/targeting.h"

diff --git a/src/market/arena-info-table.c b/src/market/arena-info-table.c
index 85cec73..681bdc8 100644 (file)
--- a/src/market/arena-info-table.c
+++ b/src/market/arena-info-table.c
@@ -4,6 +4,7 @@
 #include "object/sv-potion-types.h"
 #include "object/sv-ring-types.h"
 #include "object/sv-staff-types.h"
+#include "object/sv-wand-types.h"
 
 /*!
  * @brief 闘技場のモンスターID及び報酬アイテムテーブル

diff --git a/src/market/articles-on-sale.c b/src/market/articles-on-sale.c
index 71574b3..d232bc0 100644 (file)
--- a/src/market/articles-on-sale.c
+++ b/src/market/articles-on-sale.c
@@ -11,6 +11,7 @@
 #include "object/sv-protector-types.h"
 #include "object/sv-ring-types.h"
 #include "object/sv-staff-types.h"
+#include "object/sv-wand-types.h"
 #include "object/sv-weapon-types.h"
 
 /*!

diff --git a/src/object/object1.h b/src/object/object1.h
index 9da8645..f91a231 100644 (file)
--- a/src/object/object1.h
+++ b/src/object/object1.h
@@ -113,40 +113,6 @@ extern void torch_flags(object_type *o_ptr, BIT_FLAGS *flgs);
 extern void torch_dice(object_type *o_ptr, DICE_NUMBER *dd, DICE_SID *ds);
 extern void torch_lost_fuel(object_type *o_ptr);
 
-/* The "sval" codes for TV_WAND */
-#define SV_WAND_HEAL_MONSTER             0
-#define SV_WAND_HASTE_MONSTER            1
-#define SV_WAND_CLONE_MONSTER            2
-#define SV_WAND_TELEPORT_AWAY            3
-#define SV_WAND_DISARMING                4
-#define SV_WAND_TRAP_DOOR_DEST           5
-#define SV_WAND_STONE_TO_MUD             6
-#define SV_WAND_LITE                     7
-#define SV_WAND_SLEEP_MONSTER            8
-#define SV_WAND_SLOW_MONSTER             9
-#define SV_WAND_CONFUSE_MONSTER         10
-#define SV_WAND_FEAR_MONSTER            11
-#define SV_WAND_HYPODYNAMIA              12
-#define SV_WAND_POLYMORPH               13
-#define SV_WAND_STINKING_CLOUD          14
-#define SV_WAND_MAGIC_MISSILE           15
-#define SV_WAND_ACID_BOLT               16
-#define SV_WAND_CHARM_MONSTER           17
-#define SV_WAND_FIRE_BOLT               18
-#define SV_WAND_COLD_BOLT               19
-#define SV_WAND_ACID_BALL               20
-#define SV_WAND_ELEC_BALL               21
-#define SV_WAND_FIRE_BALL               22
-#define SV_WAND_COLD_BALL               23
-#define SV_WAND_WONDER                  24
-#define SV_WAND_DISINTEGRATE            25
-#define SV_WAND_DRAGON_FIRE             26
-#define SV_WAND_DRAGON_COLD             27
-#define SV_WAND_DRAGON_BREATH           28
-#define SV_WAND_ROCKETS                 29
-#define SV_WAND_STRIKING                30
-#define SV_WAND_GENOCIDE                31
-
 /* The "sval" codes for TV_ROD */
 #define SV_ROD_DETECT_TRAP               0
 #define SV_ROD_DETECT_DOOR               1

diff --git a/src/object/sv-wand-types.h b/src/object/sv-wand-types.h
new file mode 100644 (file)
index 0000000..517d69d
--- /dev/null
+++ b/src/object/sv-wand-types.h
@@ -0,0 +1,37 @@
+#pragma once
+
+/* The "sval" codes for TV_WAND */
+typedef enum sv_wand_type {
+    SV_WAND_HEAL_MONSTER = 0,
+    SV_WAND_HASTE_MONSTER = 1,
+    SV_WAND_CLONE_MONSTER = 2,
+    SV_WAND_TELEPORT_AWAY = 3,
+    SV_WAND_DISARMING = 4,
+    SV_WAND_TRAP_DOOR_DEST = 5,
+    SV_WAND_STONE_TO_MUD = 6,
+    SV_WAND_LITE = 7,
+    SV_WAND_SLEEP_MONSTER = 8,
+    SV_WAND_SLOW_MONSTER = 9,
+    SV_WAND_CONFUSE_MONSTER = 10,
+    SV_WAND_FEAR_MONSTER = 11,
+    SV_WAND_HYPODYNAMIA = 12,
+    SV_WAND_POLYMORPH = 13,
+    SV_WAND_STINKING_CLOUD = 14,
+    SV_WAND_MAGIC_MISSILE = 15,
+    SV_WAND_ACID_BOLT = 16,
+    SV_WAND_CHARM_MONSTER = 17,
+    SV_WAND_FIRE_BOLT = 18,
+    SV_WAND_COLD_BOLT = 19,
+    SV_WAND_ACID_BALL = 20,
+    SV_WAND_ELEC_BALL = 21,
+    SV_WAND_FIRE_BALL = 22,
+    SV_WAND_COLD_BALL = 23,
+    SV_WAND_WONDER = 24,
+    SV_WAND_DISINTEGRATE = 25,
+    SV_WAND_DRAGON_FIRE = 26,
+    SV_WAND_DRAGON_COLD = 27,
+    SV_WAND_DRAGON_BREATH = 28,
+    SV_WAND_ROCKETS = 29,
+    SV_WAND_STRIKING = 30,
+    SV_WAND_GENOCIDE = 31,
+} sv_wand_type;