[Refactor] #40416 Separated combat-options-type.h from melee.c/h

diff --git a/Hengband/Hengband/Hengband.vcxproj b/Hengband/Hengband/Hengband.vcxproj
index fe25705..aaa18d1 100644 (file)
--- a/Hengband/Hengband/Hengband.vcxproj
+++ b/Hengband/Hengband/Hengband.vcxproj
@@ -416,6 +416,7 @@
     <ClInclude Include="..\..\src\birth\quick-start.h" />\r
     <ClInclude Include="..\..\src\cmd\cmd-menu-content-table.h" />\r
     <ClInclude Include="..\..\src\combat\attack-power-table.h" />\r
+    <ClInclude Include="..\..\src\combat\combat-options-type.h" />\r
     <ClInclude Include="..\..\src\combat\hallucination-attacks-table.h" />\r
     <ClInclude Include="..\..\src\combat\insults-moans.h" />\r
     <ClInclude Include="..\..\src\combat\martial-arts-table.h" />\r

diff --git a/Hengband/Hengband/Hengband.vcxproj.filters b/Hengband/Hengband/Hengband.vcxproj.filters
index 29dce7c..41689c4 100644 (file)
--- a/Hengband/Hengband/Hengband.vcxproj.filters
+++ b/Hengband/Hengband/Hengband.vcxproj.filters
@@ -2029,6 +2029,9 @@
     <ClInclude Include="..\..\src\combat\insults-moans.h">
       <Filter>combat</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\combat\combat-options-type.h">
+      <Filter>combat</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\src\wall.bmp" />

diff --git a/src/Makefile.am b/src/Makefile.am
index 9fa2302..d6fd93e 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -338,6 +338,7 @@ hengband_SOURCES = \
        combat/monster-attack-types.c combat/monster-attack-types.h \
        combat/martial-arts-table.c combat/martial-arts-table.h \
        combat/insults-moans.c combat/insults-moans.h \
+       combat/combat-options-type.h \
        combat/shoot.c combat/shoot.h \
        combat/snipe.c combat/snipe.h \
        \

diff --git a/src/combat/combat-options-type.h b/src/combat/combat-options-type.h
new file mode 100644 (file)
index 0000000..a50e9e3
--- /dev/null
+++ b/src/combat/combat-options-type.h
@@ -0,0 +1,36 @@
+#pragma once
+
+typedef enum combat_options {
+       HISSATSU_NONE = 0,
+    HISSATSU_2 = 1,
+    HISSATSU_3WAY = 2,
+    HISSATSU_SUTEMI = 3,
+    HISSATSU_FIRE = 4,
+    HISSATSU_COLD = 5,
+    HISSATSU_POISON = 6,
+    HISSATSU_ELEC = 7,
+    HISSATSU_NYUSIN = 8,
+    HISSATSU_FUKI = 9,
+    HISSATSU_MAJIN = 10,
+    HISSATSU_BOOMER = 11,
+    HISSATSU_DRAIN = 12,
+    HISSATSU_SEKIRYUKA = 13,
+    HISSATSU_OTAKEBI = 14,
+    HISSATSU_SHOUGE = 15,
+    HISSATSU_CONF = 16,
+    HISSATSU_ISSEN = 17,
+    HISSATSU_KYUSHO = 18,
+    HISSATSU_KONSIN = 19,
+    HISSATSU_HYAKU = 20,
+    HISSATSU_MINEUCHI = 21,
+    HISSATSU_MEKIKI = 22,
+    HISSATSU_ZANMA = 23,
+    HISSATSU_UNDEAD = 24,
+    HISSATSU_HAGAN = 25,
+    HISSATSU_QUAKE = 26,
+    HISSATSU_COUNTER = 27,
+    HISSATSU_HARAI = 28,
+    HISSATSU_3DAN = 29,
+    HISSATSU_100NIN = 30,
+    HISSATSU_IAI = 100,
+} combat_options;

diff --git a/src/combat/melee.c b/src/combat/melee.c
index bd11efb..5d6af1c 100644 (file)
--- a/src/combat/melee.c
+++ b/src/combat/melee.c
@@ -53,6 +53,7 @@
 #include "combat/monster-attack-types.h"
 #include "combat/martial-arts-table.h"
 #include "combat/insults-moans.h"
+#include "combat/combat-options-type.h"
 
 #define BLOW_EFFECT_TYPE_NONE  0
 #define BLOW_EFFECT_TYPE_FEAR  1

diff --git a/src/combat/melee.h b/src/combat/melee.h
index f3e3a23..4a0916c 100644 (file)
--- a/src/combat/melee.h
+++ b/src/combat/melee.h
@@ -73,39 +73,6 @@ typedef int COMBAT_OPTION_IDX; // do_cmd_attack()用コンバットオプショ
 #define RBE_INERTIA     34 /*!< モンスターの攻撃効果: 減速させる*/
 #define RBE_STUN        35 /*!< モンスターの攻撃効果: 朦朧とさせる*/
 
-#define HISSATSU_NONE   0
-#define HISSATSU_2      1
-#define HISSATSU_3WAY   2
-#define HISSATSU_SUTEMI 3
-#define HISSATSU_FIRE   4
-#define HISSATSU_COLD   5
-#define HISSATSU_POISON 6
-#define HISSATSU_ELEC   7
-#define HISSATSU_NYUSIN 8
-#define HISSATSU_FUKI   9
-#define HISSATSU_MAJIN  10
-#define HISSATSU_BOOMER 11
-#define HISSATSU_DRAIN  12
-#define HISSATSU_SEKIRYUKA 13
-#define HISSATSU_OTAKEBI 14
-#define HISSATSU_SHOUGE 15
-#define HISSATSU_CONF   16
-#define HISSATSU_ISSEN  17
-#define HISSATSU_KYUSHO 18
-#define HISSATSU_KONSIN 19
-#define HISSATSU_HYAKU  20
-#define HISSATSU_MINEUCHI 21
-#define HISSATSU_MEKIKI 22
-#define HISSATSU_ZANMA  23
-#define HISSATSU_UNDEAD 24
-#define HISSATSU_HAGAN  25
-#define HISSATSU_QUAKE  26
-#define HISSATSU_COUNTER 27
-#define HISSATSU_HARAI  28
-#define HISSATSU_3DAN   29
-#define HISSATSU_100NIN 30
-#define HISSATSU_IAI    100
-
 extern bool test_hit_norm(player_type *attacker_ptr, HIT_RELIABILITY chance, ARMOUR_CLASS ac, bool visible);
 extern PERCENTAGE hit_chance(player_type *attacker_ptr, HIT_RELIABILITY chance, ARMOUR_CLASS ac);
 extern HIT_POINT tot_dam_aux(player_type *attacker_ptr, object_type *o_ptr, HIT_POINT tdam, monster_type *m_ptr, BIT_FLAGS mode, bool thrown);

diff --git a/src/realm/realm-hissatsu.c b/src/realm/realm-hissatsu.c
index 4fab59e..4714a5d 100644 (file)
--- a/src/realm/realm-hissatsu.c
+++ b/src/realm/realm-hissatsu.c
@@ -28,6 +28,7 @@
 #include "spell/spells2.h"
 #include "spell/spells3.h"
 #include "spell/spells-detection.h"
+#include "combat/combat-options-type.h"
 
 /*!
 * @brief 剣術の各処理を行う

diff --git a/src/spell/spells2.c b/src/spell/spells2.c
index 3c9b24f..0b92818 100644 (file)
--- a/src/spell/spells2.c
+++ b/src/spell/spells2.c
@@ -61,6 +61,7 @@
 #include "effect/spells-effect-util.h"
 #include "spell/spells-type.h"
 #include "spell/process-effect.h"
+#include "combat/combat-options-type.h"
 
 /*!
  * @brief 視界内モンスターに魔法効果を与える / Apply a "project()" directly to all viewable monsters