[Refactor] モンスターの死体を食べた時の効果のフラグを定義ごと削除

diff --git a/Hengband/Hengband/Hengband.vcxproj b/Hengband/Hengband/Hengband.vcxproj
index 69be7d3..3b8c700 100644 (file)
--- a/Hengband/Hengband/Hengband.vcxproj
+++ b/Hengband/Hengband/Hengband.vcxproj
@@ -1410,7 +1410,6 @@
     <ClInclude Include="..\..\src\monster-race\race-flags2.h" />\r
     <ClInclude Include="..\..\src\monster-race\race-flags3.h" />\r
     <ClInclude Include="..\..\src\monster-race\race-flags7.h" />\r
-    <ClInclude Include="..\..\src\monster-race\race-flags9.h" />\r
     <ClInclude Include="..\..\src\monster-race\race-indice-types.h" />\r
     <ClInclude Include="..\..\src\monster\monster-describer.h" />\r
     <ClInclude Include="..\..\src\monster\monster-description-types.h" />\r
@@ -2007,4 +2006,4 @@
     <Error Condition="!Exists('..\packages\Microsoft.NetFramework.Analyzers.3.0.0\build\Microsoft.NetFramework.Analyzers.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.NetFramework.Analyzers.3.0.0\build\Microsoft.NetFramework.Analyzers.props'))" />\r
     <Error Condition="!Exists('..\packages\Microsoft.CodeAnalysis.FxCopAnalyzers.3.0.0\build\Microsoft.CodeAnalysis.FxCopAnalyzers.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.CodeAnalysis.FxCopAnalyzers.3.0.0\build\Microsoft.CodeAnalysis.FxCopAnalyzers.props'))" />\r
   </Target>\r
-</Project>
\ No newline at end of file
+</Project>\r

diff --git a/Hengband/Hengband/Hengband.vcxproj.filters b/Hengband/Hengband/Hengband.vcxproj.filters
index 388667d..58ec9d5 100644 (file)
--- a/Hengband/Hengband/Hengband.vcxproj.filters
+++ b/Hengband/Hengband/Hengband.vcxproj.filters
@@ -3680,9 +3680,6 @@
     <ClInclude Include="..\..\src\monster-race\race-flags7.h">\r
       <Filter>monster-race</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="..\..\src\monster-race\race-flags9.h">\r
-      <Filter>monster-race</Filter>\r
-    </ClInclude>\r
     <ClInclude Include="..\..\src\monster-race\race-flags-resistance.h">\r
       <Filter>monster-race</Filter>\r
     </ClInclude>\r

diff --git a/src/Makefile.am b/src/Makefile.am
index 776a972..f95688d 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -517,7 +517,6 @@ hengband_SOURCES = \
        monster-race/race-flags1.h monster-race/race-flags2.h \
        monster-race/race-flags3.h \
        monster-race/race-flags7.h monster-race/race-flags8.h \
-       monster-race/race-flags9.h \
        monster-race/race-indice-types.h \
        monster-race/race-kind-flags.h \
        monster-race/race-resistance-mask.cpp monster-race/race-resistance-mask.h \

diff --git a/src/dungeon/dungeon.h b/src/dungeon/dungeon.h
index f86968c..7d5bb1d 100644 (file)
--- a/src/dungeon/dungeon.h
+++ b/src/dungeon/dungeon.h
@@ -78,7 +78,6 @@ struct dungeon_type {
     BIT_FLAGS mflags3{};
     BIT_FLAGS mflags7{};
     BIT_FLAGS mflags8{};
-    BIT_FLAGS mflags9{};
 
     EnumClassFlagGroup<MonsterAbilityType> mon_ability_flags;
     EnumClassFlagGroup<MonsterBehaviorType> mon_behavior_flags;

diff --git a/src/info-reader/race-info-tokens-table.h b/src/info-reader/race-info-tokens-table.h
index 195aa26..5abfee9 100644 (file)
--- a/src/info-reader/race-info-tokens-table.h
+++ b/src/info-reader/race-info-tokens-table.h
@@ -12,7 +12,6 @@
 #include "monster-race/race-flags3.h"
 #include "monster-race/race-flags7.h"
 #include "monster-race/race-flags8.h"
-#include "monster-race/race-flags9.h"
 #include "monster-race/race-kind-flags.h"
 #include "monster-race/race-visual-flags.h"
 #include "system/angband.h"

diff --git a/src/market/bounty.cpp b/src/market/bounty.cpp
index 9b35f37..cddd00f 100644 (file)
--- a/src/market/bounty.cpp
+++ b/src/market/bounty.cpp
@@ -18,7 +18,6 @@
 #include "monster-race/race-flags1.h"
 #include "monster-race/race-flags2.h"
 #include "monster-race/race-flags7.h"
-#include "monster-race/race-flags9.h"
 #include "monster-race/race-indice-types.h"
 #include "monster/monster-list.h"
 #include "monster/monster-util.h"

diff --git a/src/monster-floor/monster-death.cpp b/src/monster-floor/monster-death.cpp
index 8e25898..719631f 100644 (file)
--- a/src/monster-floor/monster-death.cpp
+++ b/src/monster-floor/monster-death.cpp
@@ -23,7 +23,6 @@
 #include "monster-race/race-flags1.h"
 #include "monster-race/race-flags2.h"
 #include "monster-race/race-flags7.h"
-#include "monster-race/race-flags9.h"
 #include "monster-race/race-indice-types.h"
 #include "monster/monster-describer.h"
 #include "monster/monster-description-types.h"

diff --git a/src/monster-race/race-flags9.h b/src/monster-race/race-flags9.h
deleted file mode 100644 (file)
index 0a86496..0000000
--- a/src/monster-race/race-flags9.h
+++ /dev/null
@@ -1,36 +0,0 @@
-#pragma once
-
-enum race_flags9 {
-    RF9_DROP_CORPSE = 0x00000001,
-    RF9_DROP_SKELETON = 0x00000002,
-    RF9_EAT_BLIND = 0x00000004,
-    RF9_EAT_CONF = 0x00000008,
-    RF9_EAT_MANA = 0x00000010,
-    RF9_EAT_NEXUS = 0x00000020,
-    RF9_EAT_SLEEP = 0x00000040,
-    RF9_EAT_BERSERKER = 0x00000080,
-    RF9_EAT_ACIDIC = 0x00000100,
-    RF9_EAT_SPEED = 0x00000200,
-    RF9_EAT_CURE = 0x00000400,
-    RF9_EAT_FIRE_RES = 0x00000800,
-    RF9_EAT_COLD_RES = 0x00001000,
-    RF9_EAT_ACID_RES = 0x00002000,
-    RF9_EAT_ELEC_RES = 0x00004000,
-    RF9_EAT_POIS_RES = 0x00008000,
-    RF9_EAT_INSANITY = 0x00010000,
-    RF9_EAT_DRAIN_EXP = 0x00020000,
-    RF9_EAT_POISONOUS = 0x00040000,
-    RF9_EAT_GIVE_STR = 0x00080000,
-    RF9_EAT_GIVE_INT = 0x00100000,
-    RF9_EAT_GIVE_WIS = 0x00200000,
-    RF9_EAT_GIVE_DEX = 0x00400000,
-    RF9_EAT_GIVE_CON = 0x00800000,
-    RF9_EAT_GIVE_CHR = 0x01000000,
-    RF9_EAT_LOSE_STR = 0x02000000,
-    RF9_EAT_LOSE_INT = 0x04000000,
-    RF9_EAT_LOSE_WIS = 0x08000000,
-    RF9_EAT_LOSE_DEX = 0x10000000,
-    RF9_EAT_LOSE_CON = 0x20000000,
-    RF9_EAT_LOSE_CHR = 0x40000000,
-    RF9_EAT_DRAIN_MANA = 0x80000000,
-};

diff --git a/src/object-enchant/others/apply-magic-others.cpp b/src/object-enchant/others/apply-magic-others.cpp
index f5108f2..f036469 100644 (file)
--- a/src/object-enchant/others/apply-magic-others.cpp
+++ b/src/object-enchant/others/apply-magic-others.cpp
@@ -11,7 +11,6 @@
 #include "inventory/inventory-slot-types.h"
 #include "monster-race/monster-race-hook.h"
 #include "monster-race/monster-race.h"
-#include "monster-race/race-flags9.h"
 #include "monster-race/race-indice-types.h"
 #include "monster/monster-list.h"
 #include "monster/monster-util.h"

diff --git a/src/system/monster-race-definition.h b/src/system/monster-race-definition.h
index b0643ac..7f35c4f 100644 (file)
--- a/src/system/monster-race-definition.h
+++ b/src/system/monster-race-definition.h
@@ -70,7 +70,6 @@ struct monster_race {
     BIT_FLAGS flags3{}; //!< Flags 3 (race/resist)
     BIT_FLAGS flags7{}; //!< Flags 7 (movement related abilities)
     BIT_FLAGS flags8{}; //!< Flags 8 (wilderness info)
-    BIT_FLAGS flags9{}; //!< Flags 9 (drops info)
     EnumClassFlagGroup<MonsterAbilityType> ability_flags; //!< 能力フラグ(魔法/ブレス) / Ability Flags
     EnumClassFlagGroup<MonsterAuraType> aura_flags; //!< オーラフラグ / Aura Flags
     EnumClassFlagGroup<MonsterBehaviorType> behavior_flags; //!< 能力フラグ（習性）