[Refactor] #40498 Separated special-defense-types.h from player-status.h

diff --git a/Hengband/Hengband/Hengband.vcxproj b/Hengband/Hengband/Hengband.vcxproj
index 7643dac..d6e0fb2 100644 (file)
--- a/Hengband/Hengband/Hengband.vcxproj
+++ b/Hengband/Hengband/Hengband.vcxproj
@@ -616,6 +616,7 @@
     <ClInclude Include="..\..\src\mspell\mspells1.h" />\r
     <ClInclude Include="..\..\src\mspell\mspells2.h" />\r
     <ClInclude Include="..\..\src\mspell\mspells3.h" />\r
+    <ClInclude Include="..\..\src\player\special-defense-types.h" />\r
     <ClInclude Include="..\..\src\system\alloc-entries.h" />\r
     <ClInclude Include="..\..\src\term\screen-processor.h" />\r
     <ClInclude Include="..\..\src\util\bit-flags-calculator.h" />\r

diff --git a/Hengband/Hengband/Hengband.vcxproj.filters b/Hengband/Hengband/Hengband.vcxproj.filters
index 45a43c0..72940b8 100644 (file)
--- a/Hengband/Hengband/Hengband.vcxproj.filters
+++ b/Hengband/Hengband/Hengband.vcxproj.filters
@@ -3166,6 +3166,9 @@
     <ClInclude Include="..\..\src\mind\stances-table.h">
       <Filter>mind</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\player\special-defense-types.h">
+      <Filter>player</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\src\wall.bmp" />

diff --git a/src/Makefile.am b/src/Makefile.am
index a14b5c7..9c6533e 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -460,6 +460,7 @@ hengband_SOURCES = \
        player/player-personalities-types.h \
        player/player-sex.c player/player-sex.h \
        player/selfinfo.c player/selfinfo.h \
+       player/special-defense-types.h \
        \
        player-attack/player-attack-util.h \
        player-attack/attack-chaos-effect.c player-attack/attack-chaos-effect.h \

diff --git a/src/cmd-action/cmd-attack.c b/src/cmd-action/cmd-attack.c
index 4d9a8f2..2cb7586 100644 (file)
--- a/src/cmd-action/cmd-attack.c
+++ b/src/cmd-action/cmd-attack.c
@@ -29,6 +29,7 @@
 #include "player/player-effects.h"
 #include "player/player-move.h"
 #include "player/player-skill.h"
+#include "player/special-defense-types.h"
 #include "spell/process-effect.h"
 #include "spell/spell-types.h"
 #include "view/display-messages.h"

diff --git a/src/cmd-action/cmd-hissatsu.c b/src/cmd-action/cmd-hissatsu.c
index 45209b2..2ab55ec 100644 (file)
--- a/src/cmd-action/cmd-hissatsu.c
+++ b/src/cmd-action/cmd-hissatsu.c
@@ -25,6 +25,7 @@
 #include "object/item-use-flags.h"
 #include "player/player-effects.h"
 #include "player/player-status.h"
+#include "player/special-defense-types.h"
 #include "spell/spells-execution.h"
 #include "spell/spells-util.h"
 #include "spell/technic-info-table.h"

diff --git a/src/cmd-action/cmd-pet.c b/src/cmd-action/cmd-pet.c
index 9635b3f..20dba92 100644 (file)
--- a/src/cmd-action/cmd-pet.c
+++ b/src/cmd-action/cmd-pet.c
@@ -36,6 +36,7 @@
 #include "player/player-move.h"
 #include "player/player-skill.h"
 #include "player/player-status.h"
+#include "player/special-defense-types.h"
 #include "term/screen-processor.h"
 #include "util/bit-flags-calculator.h"
 #include "util/int-char-converter.h"

diff --git a/src/cmd-action/cmd-spell.c b/src/cmd-action/cmd-spell.c
index d98a521..e7e0101 100644 (file)
--- a/src/cmd-action/cmd-spell.c
+++ b/src/cmd-action/cmd-spell.c
@@ -35,6 +35,7 @@
 #include "player/player-skill.h"
 #include "player/player-status.h"
 #include "player/selfinfo.h"
+#include "player/special-defense-types.h"
 #include "realm/realm-names-table.h"
 #include "spell-kind/spells-random.h"
 #include "spell-kind/spells-sight.h"

diff --git a/src/cmd-item/cmd-activate.c b/src/cmd-item/cmd-activate.c
index 12a15fc..2372a62 100644 (file)
--- a/src/cmd-item/cmd-activate.c
+++ b/src/cmd-item/cmd-activate.c
@@ -47,6 +47,7 @@
 #include "player/player-damage.h"
 #include "player/player-effects.h"
 #include "player/player-race-types.h"
+#include "player/special-defense-types.h"
 #include "realm/realm-types.h"
 #include "spell-kind/earthquake.h"
 #include "spell-kind/spells-beam.h"

diff --git a/src/cmd-item/cmd-eat.c b/src/cmd-item/cmd-eat.c
index b5688b7..ffe9d7f 100644 (file)
--- a/src/cmd-item/cmd-eat.c
+++ b/src/cmd-item/cmd-eat.c
@@ -28,6 +28,7 @@
 #include "player/player-effects.h"
 #include "player/player-race-types.h"
 #include "player/player-status.h"
+#include "player/special-defense-types.h"
 #include "spell-realm/spells-hex.h"
 #include "spell/spells-status.h"
 #include "sv-definition/sv-food-types.h"

diff --git a/src/cmd-item/cmd-item.c b/src/cmd-item/cmd-item.c
index 6a96e58..03ff5bc 100644 (file)
--- a/src/cmd-item/cmd-item.c
+++ b/src/cmd-item/cmd-item.c
@@ -60,6 +60,7 @@
 #include "player/player-race-types.h"
 #include "player/player-status.h"
 #include "player/selfinfo.h"
+#include "player/special-defense-types.h"
 #include "realm/realm-hex-numbers.h"
 #include "realm/realm-names-table.h"
 #include "realm/realm-types.h"

diff --git a/src/cmd-item/cmd-quaff.c b/src/cmd-item/cmd-quaff.c
index 837f361..0b22937 100644 (file)
--- a/src/cmd-item/cmd-quaff.c
+++ b/src/cmd-item/cmd-quaff.c
@@ -32,6 +32,7 @@
 #include "player/player-race-types.h"
 #include "player/player-status.h"
 #include "player/selfinfo.h"
+#include "player/special-defense-types.h"
 #include "realm/realm-hex-numbers.h"
 #include "spell-kind/spells-detection.h"
 #include "spell-kind/spells-floor.h"

diff --git a/src/cmd-item/cmd-read.c b/src/cmd-item/cmd-read.c
index 4f4df56..942c501 100644 (file)
--- a/src/cmd-item/cmd-read.c
+++ b/src/cmd-item/cmd-read.c
@@ -28,6 +28,7 @@
 #include "player/player-damage.h"
 #include "player/player-effects.h"
 #include "player/player-status.h"
+#include "player/special-defense-types.h"
 #include "spell-kind/spells-detection.h"
 #include "spell-kind/spells-floor.h"
 #include "spell-kind/spells-genocide.h"

diff --git a/src/cmd-item/cmd-usestaff.c b/src/cmd-item/cmd-usestaff.c
index 0ee4f94..3110ad1 100644 (file)
--- a/src/cmd-item/cmd-usestaff.c
+++ b/src/cmd-item/cmd-usestaff.c
@@ -22,6 +22,7 @@
 #include "player/player-race-types.h"
 #include "player/player-race.h"
 #include "player/player-status.h"
+#include "player/special-defense-types.h"
 #include "spell-kind/earthquake.h"
 #include "spell-kind/spells-detection.h"
 #include "spell-kind/spells-floor.h"

diff --git a/src/cmd-item/cmd-zaprod.c b/src/cmd-item/cmd-zaprod.c
index 82d2db3..c86ebf2 100644 (file)
--- a/src/cmd-item/cmd-zaprod.c
+++ b/src/cmd-item/cmd-zaprod.c
@@ -16,6 +16,7 @@
 #include "player/player-class.h"
 #include "player/player-effects.h"
 #include "player/player-status.h"
+#include "player/special-defense-types.h"
 #include "spell-kind/spells-beam.h"
 #include "spell-kind/spells-detection.h"
 #include "spell-kind/spells-floor.h"

diff --git a/src/cmd-item/cmd-zapwand.c b/src/cmd-item/cmd-zapwand.c
index 5f92f59..814fad5 100644 (file)
--- a/src/cmd-item/cmd-zapwand.c
+++ b/src/cmd-item/cmd-zapwand.c
@@ -18,6 +18,7 @@
 #include "player/player-class.h"
 #include "player/player-effects.h"
 #include "player/player-status.h"
+#include "player/special-defense-types.h"
 #include "spell-kind/spells-beam.h"
 #include "spell-kind/spells-charm.h"
 #include "spell-kind/spells-launcher.h"

diff --git a/src/cmd/cmd-basic.c b/src/cmd/cmd-basic.c
index b689d8b..47bb0e8 100644 (file)
--- a/src/cmd/cmd-basic.c
+++ b/src/cmd/cmd-basic.c
@@ -71,6 +71,7 @@
 #include "player/player-move.h"
 #include "player/player-personalities-types.h"
 #include "player/player-status.h"
+#include "player/special-defense-types.h"
 #include "realm/realm-types.h"
 #include "specific-object/chest.h"
 #include "specific-object/torch.h"

diff --git a/src/core/hp-mp-processor.c b/src/core/hp-mp-processor.c
index 7f2c8ab..427c1a2 100644 (file)
--- a/src/core/hp-mp-processor.c
+++ b/src/core/hp-mp-processor.c
@@ -15,6 +15,7 @@
 #include "player/player-effects.h"
 #include "player/player-race-types.h"
 #include "player/player-race.h"
+#include "player/special-defense-types.h"
 #include "util/bit-flags-calculator.h"
 #include "view/display-messages.h"
 #include "world/world.h"

diff --git a/src/core/hp-mp-regenerator.c b/src/core/hp-mp-regenerator.c
index 1b7a74e..084ad7b 100644 (file)
--- a/src/core/hp-mp-regenerator.c
+++ b/src/core/hp-mp-regenerator.c
@@ -4,6 +4,7 @@
 #include "monster-race/monster-race.h"
 #include "monster-race/race-flags2.h"
 #include "monster/monster-status.h"
+#include "player/special-defense-types.h"
 
 /*!<広域マップ移動時の自然回復処理カウンタ（広域マップ1マス毎に20回処理を基本とする）*/
 int wild_regen = 20;

diff --git a/src/core/player-processor.c b/src/core/player-processor.c
index 7802404..bd8c134 100644 (file)
--- a/src/core/player-processor.c
+++ b/src/core/player-processor.c
@@ -29,6 +29,7 @@
 #include "player/player-effects.h"
 #include "player/player-move.h"
 #include "player/player-skill.h"
+#include "player/special-defense-types.h"
 #include "spell-realm/spells-song.h"
 #include "spell-kind/spells-random.h"
 #include "spell-realm/spells-hex.h"

diff --git a/src/dungeon/dungeon-processor.c b/src/dungeon/dungeon-processor.c
index f3f0fd2..b84998d 100644 (file)
--- a/src/dungeon/dungeon-processor.c
+++ b/src/dungeon/dungeon-processor.c
@@ -23,6 +23,7 @@
 #include "monster/monster-util.h"
 #include "player/player-effects.h"
 #include "player/player-move.h"
+#include "player/special-defense-types.h"
 #include "realm/realm-song-numbers.h"
 #include "realm/realm-song.h"
 #include "view/display-messages.h"

diff --git a/src/effect/effect-feature.c b/src/effect/effect-feature.c
index 8a59983..00d8467 100644 (file)
--- a/src/effect/effect-feature.c
+++ b/src/effect/effect-feature.c
@@ -8,6 +8,7 @@
 #include "main/sound-of-music.h"
 #include "monster/monster-update.h"
 #include "player/player-effects.h"
+#include "player/special-defense-types.h"
 #include "room/rooms.h"
 #include "spell/process-effect.h" // 暫定、後で消す.
 #include "spell/spell-types.h"

diff --git a/src/effect/effect-player.c b/src/effect/effect-player.c
index 10fe004..a20cfde 100644 (file)
--- a/src/effect/effect-player.c
+++ b/src/effect/effect-player.c
@@ -17,6 +17,7 @@
 #include "monster/monster-description-types.h"
 #include "player/player-effects.h"
 #include "player/player-move.h"
+#include "player/special-defense-types.h"
 #include "realm/realm-hex-numbers.h"
 #include "spell-realm/spells-hex.h"
 #include "spell/spell-types.h"

diff --git a/src/floor/floor-events.c b/src/floor/floor-events.c
index 38974d7..2812759 100644 (file)
--- a/src/floor/floor-events.c
+++ b/src/floor/floor-events.c
@@ -21,6 +21,7 @@
 #include "object/object-mark-types.h"
 #include "object/object-value.h"
 #include "object-enchant/special-object-flags.h"
+#include "player/special-defense-types.h"
 #include "sv-definition/sv-amulet-types.h"
 #include "sv-definition/sv-protector-types.h"
 #include "sv-definition/sv-ring-types.h"

diff --git a/src/floor/floor-save.c b/src/floor/floor-save.c
index b271077..866971b 100644 (file)
--- a/src/floor/floor-save.c
+++ b/src/floor/floor-save.c
@@ -54,6 +54,7 @@
 #include "player/player-class.h"
 #include "player/player-effects.h"
 #include "player/player-personalities-types.h"
+#include "player/special-defense-types.h"
 #include "spell-kind/spells-floor.h"
 #include "system/system-variables.h"
 #include "util/angband-files.h"

diff --git a/src/floor/floor.c b/src/floor/floor.c
index 6d848b3..4c27e79 100644 (file)
--- a/src/floor/floor.c
+++ b/src/floor/floor.c
@@ -21,6 +21,7 @@
 #include "object/object-kind.h"
 #include "perception/object-perception.h"
 #include "player/player-effects.h"
+#include "player/special-defense-types.h"
 #include "room/rooms.h"
 #include "util/bit-flags-calculator.h"
 #include "view/display-messages.h"

diff --git a/src/io/input-key-processor.c b/src/io/input-key-processor.c
index 6d39602..f5064c7 100644 (file)
--- a/src/io/input-key-processor.c
+++ b/src/io/input-key-processor.c
@@ -64,6 +64,7 @@
 #include "player/player-class.h"
 #include "player/player-effects.h"
 #include "player/player-move.h" // do_cmd_travel() がある。後で移設する.
+#include "player/special-defense-types.h"
 #include "spell/spells-object.h"
 #include "store/store-util.h"
 #include "store/store.h" // do_cmd_store() がある。後で移設する.

diff --git a/src/io/load.c b/src/io/load.c
index 5da4cde..1d17fe9 100644 (file)
--- a/src/io/load.c
+++ b/src/io/load.c
@@ -72,6 +72,7 @@
 #include "player/player-sex.h"
 #include "player/player-skill.h"
 #include "player/race-info-table.h"
+#include "player/special-defense-types.h"
 #include "spell/spells-status.h"
 #include "store/store-util.h"
 #include "store/store.h"

diff --git a/src/mind/mind-ninja.c b/src/mind/mind-ninja.c
index 0dd4650..14ac29d 100644 (file)
--- a/src/mind/mind-ninja.c
+++ b/src/mind/mind-ninja.c
@@ -16,6 +16,7 @@
 #include "object/object-generator.h"
 #include "object/object-kind-hook.h"
 #include "player/player-effects.h"
+#include "player/special-defense-types.h"
 #include "spell-kind/spells-teleport.h"
 #include "util/bit-flags-calculator.h"
 #include "view/display-messages.h"

diff --git a/src/mind/mind.c b/src/mind/mind.c
index 626ac2b..bb7e124 100644 (file)
--- a/src/mind/mind.c
+++ b/src/mind/mind.c
@@ -47,6 +47,7 @@
 #include "player/player-effects.h"
 #include "player/player-move.h"
 #include "player/player-status.h"
+#include "player/special-defense-types.h"
 #include "spell/process-effect.h"
 #include "spell-kind/earthquake.h"
 #include "spell-kind/spells-detection.h"

diff --git a/src/mind/monk-attack.c b/src/mind/monk-attack.c
index 9f0f513..8f9866e 100644 (file)
--- a/src/mind/monk-attack.c
+++ b/src/mind/monk-attack.c
@@ -20,6 +20,7 @@
 #include "monster-race/race-flags1.h"
 #include "monster-race/race-flags3.h"
 #include "monster/monster-status.h"
+#include "player/special-defense-types.h"
 #include "util/string-processor.h"
 #include "view/display-messages.h"
 #include "world/world.h"

diff --git a/src/mind/stances-table.h b/src/mind/stances-table.h
index dc707c7..9ad20fb 100644 (file)
--- a/src/mind/stances-table.h
+++ b/src/mind/stances-table.h
@@ -1,5 +1,6 @@
 #pragma once
 
+#include "player/special-defense-types.h"
 #include "system/angband.h"
 
 typedef struct blow_stance {

diff --git a/src/monster-attack/monster-attack-player.c b/src/monster-attack/monster-attack-player.c
index b0d43cd..b04bd2c 100644 (file)
--- a/src/monster-attack/monster-attack-player.c
+++ b/src/monster-attack/monster-attack-player.c
@@ -36,6 +36,7 @@
 #include "player/player-effects.h"
 #include "player/player-move.h"
 #include "player/player-skill.h"
+#include "player/special-defense-types.h"
 #include "realm/realm-hex-numbers.h"
 #include "spell-kind/spells-teleport.h"
 #include "spell-realm/spells-hex.h"

diff --git a/src/monster/monster-processor.c b/src/monster/monster-processor.c
index bfb2dff..8d94836 100644 (file)
--- a/src/monster/monster-processor.c
+++ b/src/monster/monster-processor.c
@@ -51,6 +51,7 @@
 #include "pet/pet-fall-off.h"
 #include "player/avatar.h"
 #include "player/player-move.h"
+#include "player/special-defense-types.h"
 #include "spell-realm/spells-hex.h"
 #include "spell/spells-summon.h"
 #include "view/display-messages.h"

diff --git a/src/monster/monster-status.c b/src/monster/monster-status.c
index b38352c..998a01f 100644 (file)
--- a/src/monster/monster-status.c
+++ b/src/monster/monster-status.c
@@ -47,6 +47,7 @@
 #include "player/avatar.h"
 #include "player/player-effects.h"
 #include "player/player-personalities-types.h"
+#include "player/special-defense-types.h"
 #include "spell-kind/spells-random.h"
 #include "spell/spells-summon.h"
 #include "view/display-messages.h"

diff --git a/src/monster/monster-update.c b/src/monster/monster-update.c
index 1a6814f..1caeded 100644 (file)
--- a/src/monster/monster-update.c
+++ b/src/monster/monster-update.c
@@ -22,6 +22,7 @@
 #include "monster/smart-learn-types.h"
 #include "player/eldritch-horror.h"
 #include "player/player-move.h"
+#include "player/special-defense-types.h"
 
 /*!
  * @brief 騎乗中のモンスター情報を更新する

diff --git a/src/mspell/mspells1.c b/src/mspell/mspells1.c
index 04f0e7d..331426c 100644 (file)
--- a/src/mspell/mspells1.c
+++ b/src/mspell/mspells1.c
@@ -44,6 +44,7 @@
 #include "player/player-race-types.h"
 #include "player/player-race.h"
 #include "player/player-status.h"
+#include "player/special-defense-types.h"
 #include "realm/realm-song-numbers.h"
 #include "spell-kind/spells-teleport.h"
 #include "spell-realm/spells-hex.h"

diff --git a/src/object/warning.c b/src/object/warning.c
index 984101a..c9050fa 100644 (file)
--- a/src/object/warning.c
+++ b/src/object/warning.c
@@ -26,6 +26,7 @@
 #include "player/player-move.h"
 #include "player/player-race-types.h"
 #include "player/player-status.h"
+#include "player/special-defense-types.h"
 #include "spell/spell-types.h"
 #include "util/bit-flags-calculator.h"
 #include "view/display-messages.h"

diff --git a/src/player/digestion-processor.c b/src/player/digestion-processor.c
index b9c5d06..ae0b3de 100644 (file)
--- a/src/player/digestion-processor.c
+++ b/src/player/digestion-processor.c
@@ -4,6 +4,7 @@
 #include "player/player-damage.h"
 #include "player/player-effects.h"
 #include "player/player-move.h"
+#include "player/special-defense-types.h"
 #include "view/display-messages.h"
 #include "world/world.h"
 

diff --git a/src/player/permanent-resistances.c b/src/player/permanent-resistances.c
index 6d417d1..f1ad140 100644 (file)
--- a/src/player/permanent-resistances.c
+++ b/src/player/permanent-resistances.c
@@ -1,8 +1,9 @@
 #include "permanent-resistances.h"
+#include "object-enchant/tr-types.h"
 #include "player/player-personalities-types.h"
 #include "player/player-race-types.h"
 #include "player/player-race.h"
-#include "object-enchant/tr-types.h"
+#include "player/special-defense-types.h"
 #include "system/object-type-definition.h"
 #include "util/bit-flags-calculator.h"
 

diff --git a/src/player/player-damage.c b/src/player/player-damage.c
index 0fc544f..de489cf 100644 (file)
--- a/src/player/player-damage.c
+++ b/src/player/player-damage.c
@@ -43,6 +43,7 @@
 #include "player/player-race-types.h"
 #include "player/player-status.h"
 #include "player/race-info-table.h"
+#include "player/special-defense-types.h"
 #include "term/screen-processor.h"
 #include "term/term-color-types.h"
 #include "util/bit-flags-calculator.h"

diff --git a/src/player/player-status.c b/src/player/player-status.c
index b4d5396..75b70b7 100644 (file)
--- a/src/player/player-status.c
+++ b/src/player/player-status.c
@@ -60,6 +60,7 @@
 #include "player/player-race-types.h"
 #include "player/player-skill.h"
 #include "player/race-info-table.h"
+#include "player/special-defense-types.h"
 #include "realm/realm-hex-numbers.h"
 #include "realm/realm-names-table.h"
 #include "realm/realm-song-numbers.h"

diff --git a/src/player/player-status.h b/src/player/player-status.h
index 05e27f3..267f85b 100644 (file)
--- a/src/player/player-status.h
+++ b/src/player/player-status.h
@@ -358,30 +358,8 @@ typedef struct player_type
 #define ATTACK_HOLY            0x00000200 /*!< プレイヤーのステータス:対邪?(未使用) */
 #define ATTACK_SUIKEN  0x00000400 /*!< プレイヤーのステータス:酔拳 */
 
-       /*
-        * p_ptr->special_defenseによるプレイヤーの防御状態の定義 / Bit flags for the "p_ptr->special_defense" variable. -LM-
-        */
+       /* プレイヤーの防御状態の定義 / Bit flags for the "p_ptr->special_defense" variable. -LM- */
        BIT_FLAGS special_defense;
-#define DEFENSE_ACID   0x00000001 /*!< プレイヤーのステータス:酸免疫 */
-#define DEFENSE_ELEC   0x00000002 /*!< プレイヤーのステータス:電撃免疫 */
-#define DEFENSE_FIRE   0x00000004 /*!< プレイヤーのステータス:火炎免疫 */
-#define DEFENSE_COLD   0x00000008 /*!< プレイヤーのステータス:冷気免疫 */
-#define DEFENSE_POIS   0x00000010 /*!< プレイヤーのステータス:毒免疫 */
-#define KAMAE_GENBU     0x00000020 /*!< プレイヤーのステータス:玄武の構え */
-#define KAMAE_BYAKKO    0x00000040 /*!< プレイヤーのステータス:白虎の構え */
-#define KAMAE_SEIRYU    0x00000080 /*!< プレイヤーのステータス:青竜の構え */
-#define KAMAE_SUZAKU    0x00000100 /*!< プレイヤーのステータス:朱雀の構え */
-#define KATA_IAI        0x00000200 /*!< プレイヤーのステータス:居合 */
-#define KATA_FUUJIN     0x00000400 /*!< プレイヤーのステータス:風塵 */
-#define KATA_KOUKIJIN   0x00000800 /*!< プレイヤーのステータス:降鬼陣 */
-#define KATA_MUSOU      0x00001000 /*!< プレイヤーのステータス:無想 */
-#define NINJA_KAWARIMI  0x00002000 /*!< プレイヤーのステータス:変わり身 */
-#define NINJA_S_STEALTH 0x00004000 /*!< プレイヤーのステータス:超隠密 */
-#define MAX_KAMAE 4 /*!< 修行僧の構え最大数 */
-#define KAMAE_MASK (KAMAE_GENBU | KAMAE_BYAKKO | KAMAE_SEIRYU | KAMAE_SUZAKU) /*!< 修行僧の構えビット配列 */
-#define MAX_KATA 4 /*!< 修行僧の型最大数 */
-#define KATA_MASK (KATA_IAI | KATA_FUUJIN | KATA_KOUKIJIN | KATA_MUSOU) /*!< 修行僧の型ビット配列 */
-
        ACTION_IDX action;                /* Currently action */
 #define ACTION_NONE     0 /*!< 持続行動: なし */
 #define ACTION_SEARCH   1 /*!< 持続行動: 探索 */

diff --git a/src/player/race-resistances.c b/src/player/race-resistances.c
index c79eeaf..be2009b 100644 (file)
--- a/src/player/race-resistances.c
+++ b/src/player/race-resistances.c
@@ -3,6 +3,7 @@
 #include "object/object-flags.h"
 #include "object-enchant/tr-types.h"
 #include "player/player-race.h"
+#include "player/special-defense-types.h"
 #include "util/bit-flags-calculator.h"
 
 /*!

diff --git a/src/player/special-defense-types.h b/src/player/special-defense-types.h
new file mode 100644 (file)
index 0000000..6582d8f
--- /dev/null
+++ b/src/player/special-defense-types.h
@@ -0,0 +1,25 @@
+#pragma once
+
+typedef enum special_defence {
+       DEFENSE_ACID = 0x00000001, /*!< プレイヤーのステータス:酸免疫 */
+    DEFENSE_ELEC = 0x00000002, /*!< プレイヤーのステータス:電撃免疫 */
+    DEFENSE_FIRE = 0x00000004, /*!< プレイヤーのステータス:火炎免疫 */
+    DEFENSE_COLD = 0x00000008, /*!< プレイヤーのステータス:冷気免疫 */
+    DEFENSE_POIS = 0x00000010, /*!< プレイヤーのステータス:毒免疫 */
+    KAMAE_GENBU = 0x00000020, /*!< プレイヤーのステータス:玄武の構え */
+    KAMAE_BYAKKO = 0x00000040, /*!< プレイヤーのステータス:白虎の構え */
+    KAMAE_SEIRYU = 0x00000080, /*!< プレイヤーのステータス:青竜の構え */
+    KAMAE_SUZAKU = 0x00000100, /*!< プレイヤーのステータス:朱雀の構え */
+    KATA_IAI = 0x00000200, /*!< プレイヤーのステータス:居合 */
+    KATA_FUUJIN = 0x00000400, /*!< プレイヤーのステータス:風塵 */
+    KATA_KOUKIJIN = 0x00000800, /*!< プレイヤーのステータス:降鬼陣 */
+    KATA_MUSOU = 0x00001000, /*!< プレイヤーのステータス:無想 */
+    NINJA_KAWARIMI = 0x00002000, /*!< プレイヤーのステータス:変わり身 */
+    NINJA_S_STEALTH = 0x00004000, /*!< プレイヤーのステータス:超隠密 */
+} special_defence;
+
+#define MAX_KAMAE 4 /*!< 修行僧の構え最大数 */
+#define KAMAE_MASK (KAMAE_GENBU | KAMAE_BYAKKO | KAMAE_SEIRYU | KAMAE_SUZAKU) /*!< 修行僧の構えビット配列 */
+
+#define MAX_KATA 4 /*!< 修行僧の型最大数 */
+#define KATA_MASK (KATA_IAI | KATA_FUUJIN | KATA_KOUKIJIN | KATA_MUSOU) /*!< 修行僧の型ビット配列 */

diff --git a/src/player/temporary-resistances.c b/src/player/temporary-resistances.c
index b7eba7e..ccd06e2 100644 (file)
--- a/src/player/temporary-resistances.c
+++ b/src/player/temporary-resistances.c
@@ -2,6 +2,7 @@
 #include "object-enchant/tr-types.h"
 #include "player/player-race-types.h"
 #include "player/player-race.h"
+#include "player/special-defense-types.h"
 #include "realm/realm-hex-numbers.h"
 #include "realm/realm-song-numbers.h"
 #include "realm/realm-types.h"

diff --git a/src/spell-kind/earthquake.c b/src/spell-kind/earthquake.c
index 9a4a717..e8d6580 100644 (file)
--- a/src/spell-kind/earthquake.c
+++ b/src/spell-kind/earthquake.c
@@ -20,6 +20,7 @@
 #include "player/player-damage.h"
 #include "player/player-effects.h"
 #include "player/player-move.h"
+#include "player/special-defense-types.h"
 #include "util/bit-flags-calculator.h"
 #include "view/display-messages.h"
 

diff --git a/src/spell-kind/spells-floor.c b/src/spell-kind/spells-floor.c
index 758e84c..3c96826 100644 (file)
--- a/src/spell-kind/spells-floor.c
+++ b/src/spell-kind/spells-floor.c
@@ -35,6 +35,7 @@
 #include "object/object-mark-types.h"
 #include "perception/object-perception.h"
 #include "player/player-effects.h"
+#include "player/special-defense-types.h"
 #include "spell-kind/spells-teleport.h"
 #include "spell/process-effect.h"
 #include "spell/spell-types.h"

diff --git a/src/spell-kind/spells-lite.c b/src/spell-kind/spells-lite.c
index 81fc50b..ba4aa25 100644 (file)
--- a/src/spell-kind/spells-lite.c
+++ b/src/spell-kind/spells-lite.c
@@ -10,6 +10,7 @@
 #include "monster/monster-status.h"
 #include "monster/monster-update.h"
 #include "player/player-effects.h"
+#include "player/special-defense-types.h"
 #include "spell/process-effect.h"
 #include "spell-kind/spells-launcher.h"
 #include "spell/spell-types.h"

diff --git a/src/view/status-first-page.c b/src/view/status-first-page.c
index 3b62dca..cbd938c 100644 (file)
--- a/src/view/status-first-page.c
+++ b/src/view/status-first-page.c
@@ -16,6 +16,7 @@
 #include "object-enchant/tr-types.h"
 #include "object/object-flags.h"
 #include "perception/object-perception.h"
+#include "player/special-defense-types.h"
 #include "sv-definition/sv-weapon-types.h"
 #include "term/term-color-types.h"
 #include "util/bit-flags-calculator.h"