[Refactor] セリフフラグを再定義

diff --git a/Hengband/Hengband/Hengband.vcxproj b/Hengband/Hengband/Hengband.vcxproj
index 4341021..0258628 100644 (file)
--- a/Hengband/Hengband/Hengband.vcxproj
+++ b/Hengband/Hengband/Hengband.vcxproj
@@ -972,6 +972,7 @@
     <ClInclude Include="..\..\src\monster-race\race-kind-flags.h" />\r
     <ClInclude Include="..\..\src\monster-race\race-population-flags.h" />\r
     <ClInclude Include="..\..\src\monster-race\race-resistance-mask.h" />\r
+    <ClInclude Include="..\..\src\monster-race\race-speak-flags.h" />\r
     <ClInclude Include="..\..\src\monster-race\race-visual-flags.h" />\r
     <ClInclude Include="..\..\src\monster-race\race-wilderness-flags.h" />\r
     <ClInclude Include="..\..\src\mspell\mspell-attack\abstract-mspell.h" />\r

diff --git a/Hengband/Hengband/Hengband.vcxproj.filters b/Hengband/Hengband/Hengband.vcxproj.filters
index 3fa8579..a01e8dd 100644 (file)
--- a/Hengband/Hengband/Hengband.vcxproj.filters
+++ b/Hengband/Hengband/Hengband.vcxproj.filters
@@ -5340,6 +5340,9 @@
     <ClInclude Include="..\..\src\monster-race\race-population-flags.h">\r
       <Filter>monster-race</Filter>\r
     </ClInclude>\r
+    <ClInclude Include="..\..\src\monster-race\race-speak-flags.h">\r
+      <Filter>monster-race</Filter>\r
+    </ClInclude>\r
   </ItemGroup>\r
   <ItemGroup>\r
     <None Include="..\..\src\wall.bmp" />\r

diff --git a/src/Makefile.am b/src/Makefile.am
index fcec1c0..aebff0c 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -523,6 +523,7 @@ hengband_SOURCES = \
        monster-race/race-kind-flags.h \
        monster-race/race-population-flags.h \
        monster-race/race-resistance-mask.cpp monster-race/race-resistance-mask.h \
+       monster-race/race-speak-flags.h \
        monster-race/race-visual-flags.h \
        monster-race/race-wilderness-flags.h \
        \

diff --git a/src/dungeon/dungeon.h b/src/dungeon/dungeon.h
index 7688bdd..5c3614e 100644 (file)
--- a/src/dungeon/dungeon.h
+++ b/src/dungeon/dungeon.h
@@ -12,6 +12,7 @@
 #include "monster-race/race-kind-flags.h"
 #include "monster-race/race-population-flags.h"
 #include "monster-race/race-resistance-mask.h"
+#include "monster-race/race-speak-flags.h"
 #include "monster-race/race-visual-flags.h"
 #include "monster-race/race-wilderness-flags.h"
 #include "system/angband.h"
@@ -91,6 +92,7 @@ struct dungeon_type {
     EnumClassFlagGroup<MonsterWildernessType> mon_wilderness_flags;
     EnumClassFlagGroup<MonsterFeatureType> mon_feature_flags;
     EnumClassFlagGroup<MonsterPopulationType> mon_population_flags;
+    EnumClassFlagGroup<MonsterSpeakType> mon_speak_flags;
 
     std::vector<char> r_chars; /* Monster symbols allowed */
     KIND_OBJECT_IDX final_object{}; /* The object you'll find at the bottom */

diff --git a/src/monster-race/race-speak-flags.h b/src/monster-race/race-speak-flags.h
new file mode 100644 (file)
index 0000000..f7cf6cf
--- /dev/null
+++ b/src/monster-race/race-speak-flags.h
@@ -0,0 +1,11 @@
+#pragma once
+
+enum class MonsterSpeakType {
+    SPEAK_ALL = 0, /* SPEAK_BATTLE, SPEAK_FEAR, SPEAK_FRIEND, SPEAK_DEATH */
+    SPEAK_BATTLE = 1,
+    SPEAK_FEAR = 2,
+    SPEAK_FRIEND = 3,
+    SPEAK_DEATH = 4,
+    SPEAK_SPAWN = 5,
+    MAX
+};

diff --git a/src/system/monster-race-definition.h b/src/system/monster-race-definition.h
index b04cbfc..f2654fa 100644 (file)
--- a/src/system/monster-race-definition.h
+++ b/src/system/monster-race-definition.h
@@ -10,6 +10,7 @@
 #include "monster-race/race-flags-resistance.h"
 #include "monster-race/race-kind-flags.h"
 #include "monster-race/race-population-flags.h"
+#include "monster-race/race-speak-flags.h"
 #include "monster-race/race-visual-flags.h"
 #include "monster-race/race-wilderness-flags.h"
 #include "system/angband.h"
@@ -83,6 +84,7 @@ struct monster_race {
     EnumClassFlagGroup<MonsterWildernessType> wilderness_flags; //!< 荒野フラグ / Wilderness Flags
     EnumClassFlagGroup<MonsterFeatureType> feature_flags; //!< 能力フラグ（地形関連） / Feature Flags
     EnumClassFlagGroup<MonsterPopulationType> population_flags; //!< 能力フラグ（出現数関連） / Population Flags
+    EnumClassFlagGroup<MonsterSpeakType> speak_flags; //!< 能力フラグ（セリフ） / Speaking Flags
     MonsterBlow blow[MAX_NUM_BLOWS]{}; //!< 打撃能力定義 / Up to four blows per round
 
     //! 指定護衛リスト <モンスター種族ID,護衛数ダイス数,護衛数ダイス面>