OSDN Git Service

[Refactor] #40399 Separated sv-digging-types.h from object.h
authorHourier <hourier@users.sourceforge.jp>
Thu, 28 May 2020 13:37:12 +0000 (22:37 +0900)
committerHourier <hourier@users.sourceforge.jp>
Thu, 28 May 2020 13:39:34 +0000 (22:39 +0900)
Hengband/Hengband/Hengband.vcxproj
Hengband/Hengband/Hengband.vcxproj.filters
src/Makefile.am
src/market/articles-on-sale.c
src/object/object1.h
src/object/sv-digging-types.h [new file with mode: 0644]

index c1286b1..08d01ec 100644 (file)
     <ClInclude Include="..\..\src\object\old-ego-extra-values.h" />\r
     <ClInclude Include="..\..\src\object\special-object-flags.h" />\r
     <ClInclude Include="..\..\src\object\sv-bow-types.h" />\r
+    <ClInclude Include="..\..\src\object\sv-digging-types.h" />\r
     <ClInclude Include="..\..\src\object\sv-other-types.h" />\r
     <ClInclude Include="..\..\src\object\tr-types.h" />\r
     <ClInclude Include="..\..\src\object\trc-types.h" />\r
index d7940c7..c9f758b 100644 (file)
     <ClInclude Include="..\..\src\object\sv-bow-types.h">
       <Filter>object</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\object\sv-digging-types.h">
+      <Filter>object</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\src\wall.bmp" />
index 0b0bf53..75aa164 100644 (file)
@@ -208,7 +208,7 @@ hengband_SOURCES = \
        object/old-ego-extra-values.h object/special-object-flags.h \
        object/object-mark-types.h object/object-util.h \
        object/item-apply-magic.h \
-       object/sv-bow-types.h object/sv-other-types.h \
+       object/sv-bow-types.h object/sv-digging-types.h object/sv-other-types.h \
        object/item-feeling.h object/item-use-flags.h \
        \
        inventory/simple-appraiser.c inventory/simple-appraiser.h \
index b9c1e5f..f88bcc5 100644 (file)
@@ -2,6 +2,7 @@
 #include "store/store-owners.h"
 #include "articles-on-sale.h"
 #include "object/sv-bow-types.h"
+#include "object/sv-digging-types.h"
 #include "object/sv-other-types.h"
 
 /*!
index dbad362..b59e221 100644 (file)
@@ -113,99 +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_DIGGING */
-#define SV_SHOVEL                        1
-#define SV_GNOMISH_SHOVEL                2
-#define SV_DWARVEN_SHOVEL                3
-#define SV_PICK                          4
-#define SV_ORCISH_PICK                   5
-#define SV_DWARVEN_PICK                  6
-#define SV_MATTOCK                       7
-
-/* The "sval" values for TV_HAFTED */
-#define SV_CLUB                          1     /* 1d4  */
-#define SV_WHIP                          2     /* 1d6  */
-#define SV_QUARTERSTAFF                  3     /* 1d9  */
-#define SV_NUNCHAKU                      4     /* 2d3  */
-#define SV_MACE                          5     /* 2d4  */
-#define SV_BALL_AND_CHAIN                6     /* 2d4  */
-#define SV_JO_STAFF                      7     /* 1d7  */
-#define SV_WAR_HAMMER                    8     /* 3d3  */
-#define SV_THREE_PIECE_ROD              11     /* 3d3  */
-#define SV_MORNING_STAR                 12     /* 2d6  */
-#define SV_FLAIL                        13     /* 2d6  */
-#define SV_BO_STAFF                     14     /* 1d11 */
-#define SV_LEAD_FILLED_MACE             15     /* 3d4  */
-#define SV_TETSUBO                      16     /* 2d7  */
-#define SV_TWO_HANDED_FLAIL             18     /* 3d6  */
-#define SV_GREAT_HAMMER                 19     /* 4d6  */
-#define SV_MACE_OF_DISRUPTION           20     /* 5d8  */
-#define SV_WIZSTAFF                     21     /* 1d2  */
-#define SV_GROND                        50     /* 3d9  */
-#define SV_NAMAKE_HAMMER                63     /* 1d77 */
-
-/* The "sval" values for TV_POLEARM */
-#define SV_HATCHET                       1     /* 1d5 */
-#define SV_SPEAR                         2     /* 1d6 */
-#define SV_SICKLE                        3     /* 2d3 */
-#define SV_AWL_PIKE                      4     /* 1d8 */
-#define SV_TRIDENT                       5     /* 1d9 */
-#define SV_FAUCHARD                      6  /* 1d10 */
-#define SV_BROAD_SPEAR                   7     /* 1d9 */
-#define SV_PIKE                          8     /* 2d5 */
-#define SV_NAGINATA                      9  /* 2d6 */
-#define SV_BEAKED_AXE                   10     /* 2d6 */
-#define SV_BROAD_AXE                    11     /* 2d6 */
-#define SV_LUCERNE_HAMMER               12     /* 2d5  */
-#define SV_GLAIVE                       13     /* 2d6 */
-#define SV_LAJATANG                     14     /* 2d7 */
-#define SV_HALBERD                      15     /* 3d4 */
-#define SV_GUISARME                     16  /* 2d5 */
-#define SV_SCYTHE                       17     /* 5d3 */
-#define SV_LANCE                        20     /* 2d8 */
-#define SV_BATTLE_AXE                   22     /* 2d8 */
-#define SV_GREAT_AXE                    25     /* 4d4 */
-#define SV_TRIFURCATE_SPEAR             26     /* 2d9 */
-#define SV_LOCHABER_AXE                 28     /* 3d8 */
-#define SV_HEAVY_LANCE                  29  /* 4d8 */
-#define SV_SCYTHE_OF_SLICING            30     /* 8d4 */
-#define SV_TSURIZAO                     40     /* 1d1 */
-#define SV_DEATH_SCYTHE                 50     /* 10d10 */
-
-/* The "sval" codes for TV_SWORD */
-#define SV_BROKEN_DAGGER                 1  /* 1d1 */
-#define SV_BROKEN_SWORD                  2  /* 1d2 */
-#define SV_DAGGER                        4  /* 1d4 */
-#define SV_MAIN_GAUCHE                   5  /* 1d5 */
-#define SV_TANTO                         6  /* 1d5 */
-#define SV_RAPIER                        7  /* 1d6 */
-#define SV_SMALL_SWORD                   8  /* 1d6 */
-#define SV_BASILLARD                     9  /* 1d8 */
-#define SV_SHORT_SWORD                  10  /* 1d7 */
-#define SV_SABRE                        11  /* 1d7 */
-#define SV_CUTLASS                      12  /* 1d7 */
-#define SV_WAKIZASHI                    13  /* 2d4 */
-#define SV_KHOPESH                      14  /* 2d4 */
-#define SV_TULWAR                       15  /* 2d4 */
-#define SV_BROAD_SWORD                  16  /* 2d5 */
-#define SV_LONG_SWORD                   17  /* 2d5 */
-#define SV_SCIMITAR                     18  /* 2d5 */
-#define SV_NINJATO                      19  /* 1d9 */
-#define SV_KATANA                       20  /* 3d4 */
-#define SV_BASTARD_SWORD                21  /* 3d4 */
-#define SV_GREAT_SCIMITAR               22  /* 4d5 */
-#define SV_CLAYMORE                     23  /* 2d8 */
-#define SV_ESPADON                      24  /* 2d9 */
-#define SV_TWO_HANDED_SWORD             25  /* 3d6 */
-#define SV_FLAMBERGE                    26  /* 3d7 */
-#define SV_NO_DACHI                     27  /* 5d4 */
-#define SV_EXECUTIONERS_SWORD           28  /* 4d5 */
-#define SV_ZWEIHANDER                   29  /* 4d6 */
-#define SV_BLADE_OF_CHAOS               30  /* 6d5 */
-#define SV_DIAMOND_EDGE                 31  /* 7d5 */
-#define SV_POISON_NEEDLE                32  /* 1d1 */
-#define SV_HAYABUSA                     33  /* 1d6 */
-
 /* The "sval" codes for TV_SHIELD */
 #define SV_SMALL_LEATHER_SHIELD          2
 #define SV_SMALL_METAL_SHIELD            3
diff --git a/src/object/sv-digging-types.h b/src/object/sv-digging-types.h
new file mode 100644 (file)
index 0000000..e0402ed
--- /dev/null
@@ -0,0 +1,12 @@
+#pragma once
+
+/* The "sval" codes for TV_DIGGING */
+typedef enum sv_digging_type {
+       SV_SHOVEL = 1,
+    SV_GNOMISH_SHOVEL = 2,
+    SV_DWARVEN_SHOVEL = 3,
+    SV_PICK = 4,
+    SV_ORCISH_PICK = 5,
+    SV_DWARVEN_PICK = 6,
+    SV_MATTOCK = 7,
+} sv_digging_type;