[Refactor] #963 Separated take_turn() and free_turn() from player-status.cpp/h to...

diff --git a/Hengband/Hengband/Hengband.vcxproj b/Hengband/Hengband/Hengband.vcxproj
index 747b724..b586a60 100644 (file)
--- a/Hengband/Hengband/Hengband.vcxproj
+++ b/Hengband/Hengband/Hengband.vcxproj
@@ -268,6 +268,7 @@
     <ClCompile Include="..\..\src\cmd-action\cmd-tunnel.cpp" />\r
     <ClCompile Include="..\..\src\action\movement-execution.cpp" />\r
     <ClCompile Include="..\..\src\main-win\graphics-win.cpp" />\r
+    <ClCompile Include="..\..\src\player-status\player-energy.cpp" />\r
     <ClCompile Include="..\..\src\store\cmd-store.cpp" />\r
     <ClCompile Include="..\..\src\cmd-io\cmd-floor.cpp" />\r
     <ClCompile Include="..\..\src\cmd-io\cmd-lore.cpp" />\r
@@ -936,6 +937,7 @@
     <ClInclude Include="..\..\src\action\movement-execution.h" />\r
     <ClInclude Include="..\..\src\main-win\graphics-win.h" />\r
     <ClInclude Include="..\..\src\main-win\string-win.h" />\r
+    <ClInclude Include="..\..\src\player-status\player-energy.h" />\r
     <ClInclude Include="..\..\src\player-status\player-hand-types.h" />\r
     <ClInclude Include="..\..\src\store\cmd-store.h" />\r
     <ClInclude Include="..\..\src\cmd-io\cmd-floor.h" />\r

diff --git a/Hengband/Hengband/Hengband.vcxproj.filters b/Hengband/Hengband/Hengband.vcxproj.filters
index f769f70..5c61858 100644 (file)
--- a/Hengband/Hengband/Hengband.vcxproj.filters
+++ b/Hengband/Hengband/Hengband.vcxproj.filters
@@ -2262,6 +2262,9 @@
     <ClCompile Include="..\..\src\hpmp\hp-mp-regenerator.cpp">\r
       <Filter>hpmp</Filter>\r
     </ClCompile>\r
+    <ClCompile Include="..\..\src\player-status\player-energy.cpp">\r
+      <Filter>player-status</Filter>\r
+    </ClCompile>\r
   </ItemGroup>\r
   <ItemGroup>\r
     <ClInclude Include="..\..\src\combat\shoot.h">\r
@@ -4872,6 +4875,10 @@
     <ClInclude Include="..\..\src\hpmp\hp-mp-regenerator.h">\r
       <Filter>hpmp</Filter>\r
     </ClInclude>\r
+    <ClInclude Include="..\..\src\main-win\tile-info.h" />\r
+    <ClInclude Include="..\..\src\player-status\player-energy.h">\r
+      <Filter>player-status</Filter>\r
+    </ClInclude>\r
   </ItemGroup>\r
   <ItemGroup>\r
     <None Include="..\..\src\wall.bmp" />\r

diff --git a/src/action/activation-execution.cpp b/src/action/activation-execution.cpp
index 804b128..f797233 100644 (file)
--- a/src/action/activation-execution.cpp
+++ b/src/action/activation-execution.cpp
@@ -26,7 +26,7 @@
 #include "object-hook/hook-enchant.h"
 #include "object/object-info.h"
 #include "object/object-kind.h"
-#include "player/player-status.h"
+#include "player-status/player-energy.h"
 #include "racial/racial-android.h"
 #include "specific-object/monster-ball.h"
 #include "spell-kind/spells-launcher.h"

diff --git a/src/action/movement-execution.cpp b/src/action/movement-execution.cpp
index 3748f4a..1f72d14 100644 (file)
--- a/src/action/movement-execution.cpp
+++ b/src/action/movement-execution.cpp
@@ -30,6 +30,7 @@
 #include "monster/monster-status.h"
 #include "mutation/mutation-flag-types.h"
 #include "object/warning.h"
+#include "player-status/player-energy.h"
 #include "player/player-move.h"
 #include "player/player-status-flags.h"
 #include "player/player-status.h"

diff --git a/src/action/mutation-execution.cpp b/src/action/mutation-execution.cpp
index 4ca7083..c500faf 100644 (file)
--- a/src/action/mutation-execution.cpp
+++ b/src/action/mutation-execution.cpp
@@ -29,6 +29,7 @@
 #include "object-enchant/item-feeling.h"
 #include "object-hook/hook-checker.h"
 #include "player-info/self-info.h"
+#include "player-status/player-energy.h"
 #include "player/player-damage.h"
 #include "player/player-status.h"
 #include "racial/racial-vampire.h"

diff --git a/src/action/open-close-execution.cpp b/src/action/open-close-execution.cpp
index fe8082c..ceb563c 100644 (file)
--- a/src/action/open-close-execution.cpp
+++ b/src/action/open-close-execution.cpp
@@ -16,8 +16,8 @@
 #include "main/sound-definitions-table.h"
 #include "main/sound-of-music.h"
 #include "perception/object-perception.h"
+#include "player-status/player-energy.h"
 #include "player/player-status-table.h"
-#include "player/player-status.h"
 #include "specific-object/chest.h"
 #include "status/bad-status-setter.h"
 #include "status/experience.h"

diff --git a/src/action/racial-execution.cpp b/src/action/racial-execution.cpp
index 1b7aaca..4589403 100644 (file)
--- a/src/action/racial-execution.cpp
+++ b/src/action/racial-execution.cpp
@@ -7,7 +7,7 @@
 #include "action/action-limited.h"
 #include "core/asking-player.h"
 #include "game-option/disturbance-options.h"
-#include "player/player-status.h"
+#include "player-status/player-energy.h"
 #include "racial/racial-switcher.h"
 #include "racial/racial-util.h"
 #include "system/player-type-definition.h"

diff --git a/src/action/run-execution.cpp b/src/action/run-execution.cpp
index d797a7c..3fd5343 100644 (file)
--- a/src/action/run-execution.cpp
+++ b/src/action/run-execution.cpp
@@ -15,6 +15,7 @@
 #include "main/sound-definitions-table.h"
 #include "main/sound-of-music.h"
 #include "object/object-mark-types.h"
+#include "player-status/player-energy.h"
 #include "player/player-status-flags.h"
 #include "player/player-status.h"
 #include "system/floor-type-definition.h"

diff --git a/src/action/travel-execution.cpp b/src/action/travel-execution.cpp
index 20211d1..9f70a5c 100644 (file)
--- a/src/action/travel-execution.cpp
+++ b/src/action/travel-execution.cpp
@@ -13,8 +13,8 @@
 #include "game-option/special-options.h"
 #include "grid/feature.h"
 #include "grid/grid.h"
+#include "player-status/player-energy.h"
 #include "player/player-move.h"
-#include "player/player-status.h"
 #include "system/floor-type-definition.h"
 #include "system/monster-type-definition.h"
 #include "system/player-type-definition.h"

diff --git a/src/action/tunnel-execution.cpp b/src/action/tunnel-execution.cpp
index 27baf27..30b7573 100644 (file)
--- a/src/action/tunnel-execution.cpp
+++ b/src/action/tunnel-execution.cpp
@@ -11,8 +11,8 @@
 #include "main/sound-definitions-table.h"
 #include "main/sound-of-music.h"
 #include "player-info/avatar.h"
+#include "player-status/player-energy.h"
 #include "player/player-move.h"
-#include "player/player-status.h"
 #include "system/floor-type-definition.h"
 #include "system/player-type-definition.h"
 #include "util/bit-flags-calculator.h"

diff --git a/src/cmd-action/cmd-attack.cpp b/src/cmd-action/cmd-attack.cpp
index 1d308c0..55cd9e0 100644 (file)
--- a/src/cmd-action/cmd-attack.cpp
+++ b/src/cmd-action/cmd-attack.cpp
@@ -33,6 +33,7 @@
 #include "object/item-use-flags.h"
 #include "player-attack/player-attack.h"
 #include "player-info/avatar.h"
+#include "player-status/player-energy.h"
 #include "player-status/player-hand-types.h"
 #include "player/attack-defense-types.h"
 #include "player/player-damage.h"

diff --git a/src/cmd-action/cmd-hissatsu.cpp b/src/cmd-action/cmd-hissatsu.cpp
index aff2cbb..c487765 100644 (file)
--- a/src/cmd-action/cmd-hissatsu.cpp
+++ b/src/cmd-action/cmd-hissatsu.cpp
@@ -26,6 +26,7 @@
 #include "main/sound-of-music.h"
 #include "monster-race/monster-race-hook.h"
 #include "object/item-use-flags.h"
+#include "player-status/player-energy.h"
 #include "player/attack-defense-types.h"
 #include "player/player-status.h"
 #include "player/special-defense-types.h"

diff --git a/src/cmd-action/cmd-mane.cpp b/src/cmd-action/cmd-mane.cpp
index 9db6d57..8143202 100644 (file)
--- a/src/cmd-action/cmd-mane.cpp
+++ b/src/cmd-action/cmd-mane.cpp
@@ -35,8 +35,8 @@
 #include "monster/monster-processor.h"
 #include "monster/monster-status.h"
 #include "mspell/monster-power-table.h"
+#include "player-status/player-energy.h"
 #include "player/player-status-table.h"
-#include "player/player-status.h"
 #include "spell-kind/spells-launcher.h"
 #include "spell-kind/spells-lite.h"
 #include "spell-kind/spells-neighbor.h"

diff --git a/src/cmd-action/cmd-mind.cpp b/src/cmd-action/cmd-mind.cpp
index 35fb9be..42accd6 100644 (file)
--- a/src/cmd-action/cmd-mind.cpp
+++ b/src/cmd-action/cmd-mind.cpp
@@ -33,6 +33,7 @@
 #include "mind/mind-numbers.h"
 #include "mind/mind-power-getter.h"
 #include "mind/mind-types.h"
+#include "player-status/player-energy.h"
 #include "player/player-class.h"
 #include "player/player-damage.h"
 #include "player/player-status-table.h"

diff --git a/src/cmd-action/cmd-move.cpp b/src/cmd-action/cmd-move.cpp
index c274697..78a5395 100644 (file)
--- a/src/cmd-action/cmd-move.cpp
+++ b/src/cmd-action/cmd-move.cpp
@@ -25,6 +25,7 @@
 #include "io/write-diary.h"
 #include "mind/mind-ninja.h"
 #include "player-info/avatar.h"
+#include "player-status/player-energy.h"
 #include "player/attack-defense-types.h"
 #include "player/player-move.h"
 #include "player/player-status.h"

diff --git a/src/cmd-action/cmd-open-close.cpp b/src/cmd-action/cmd-open-close.cpp
index fd57ade..f868009 100644 (file)
--- a/src/cmd-action/cmd-open-close.cpp
+++ b/src/cmd-action/cmd-open-close.cpp
@@ -12,8 +12,8 @@
 #include "inventory/inventory-object.h"
 #include "inventory/inventory-slot-types.h"
 #include "io/input-key-requester.h"
+#include "player-status/player-energy.h"
 #include "player/attack-defense-types.h"
-#include "player/player-status.h"
 #include "player/special-defense-types.h"
 #include "specific-object/chest.h"
 #include "status/action-setter.h"

diff --git a/src/cmd-action/cmd-others.cpp b/src/cmd-action/cmd-others.cpp
index e59e9fa..84998a5 100644 (file)
--- a/src/cmd-action/cmd-others.cpp
+++ b/src/cmd-action/cmd-others.cpp
@@ -25,9 +25,9 @@
 #include "io/write-diary.h"
 #include "main/music-definitions-table.h"
 #include "main/sound-of-music.h"
+#include "player-status/player-energy.h"
 #include "player/attack-defense-types.h"
 #include "player/player-move.h"
-#include "player/player-status.h"
 #include "player/special-defense-types.h"
 #include "status/action-setter.h"
 #include "system/floor-type-definition.h"

diff --git a/src/cmd-action/cmd-pet.cpp b/src/cmd-action/cmd-pet.cpp
index 11abbe7..da2ceb9 100644 (file)
--- a/src/cmd-action/cmd-pet.cpp
+++ b/src/cmd-action/cmd-pet.cpp
@@ -36,6 +36,7 @@
 #include "monster/smart-learn-types.h"
 #include "object-hook/hook-weapon.h"
 #include "pet/pet-util.h"
+#include "player-status/player-energy.h"
 #include "player-status/player-hand-types.h"
 #include "player/attack-defense-types.h"
 #include "player/player-class.h"

diff --git a/src/cmd-action/cmd-racial.cpp b/src/cmd-action/cmd-racial.cpp
index 851e810..853c5a5 100644 (file)
--- a/src/cmd-action/cmd-racial.cpp
+++ b/src/cmd-action/cmd-racial.cpp
@@ -1,6 +1,9 @@
-#include "cmd-action/cmd-racial.h"
+#include <string>
+
+#include "cmd-action/cmd-racial.h"
 #include "action/action-limited.h"
 #include "action/mutation-execution.h"
+#include "action/racial-execution.h"
 #include "core/asking-player.h"
 #include "core/player-redraw-types.h"
 #include "core/player-update-types.h"
@@ -11,13 +14,12 @@
 #include "io/input-key-requester.h"
 #include "main/sound-of-music.h"
 #include "mutation/mutation-flag-types.h"
+#include "player-status/player-energy.h"
 #include "player/attack-defense-types.h"
 #include "player/player-damage.h"
-#include "player/player-status.h"
 #include "player/special-defense-types.h"
 #include "racial/class-racial-switcher.h"
 #include "racial/mutation-racial-selector.h"
-#include "action/racial-execution.h"
 #include "racial/race-racial-command-setter.h"
 #include "racial/racial-util.h"
 #include "status/action-setter.h"
@@ -27,7 +29,6 @@
 #include "util/buffer-shaper.h"
 #include "util/int-char-converter.h"
 #include "view/display-messages.h"
-#include <string>
 
 #define RC_PAGE_SIZE 18
 

diff --git a/src/cmd-action/cmd-spell.cpp b/src/cmd-action/cmd-spell.cpp
index 2ec82cd..39f7556 100644 (file)
--- a/src/cmd-action/cmd-spell.cpp
+++ b/src/cmd-action/cmd-spell.cpp
@@ -32,6 +32,7 @@
 #include "object/item-use-flags.h"
 #include "player-info/avatar.h"
 #include "player-info/self-info.h"
+#include "player-status/player-energy.h"
 #include "player/attack-defense-types.h"
 #include "player/eldritch-horror.h"
 #include "player/player-class.h"

diff --git a/src/cmd-action/cmd-tunnel.cpp b/src/cmd-action/cmd-tunnel.cpp
index f14d3c7..606e677 100644 (file)
--- a/src/cmd-action/cmd-tunnel.cpp
+++ b/src/cmd-action/cmd-tunnel.cpp
@@ -7,8 +7,8 @@
 #include "grid/feature.h"
 #include "grid/grid.h"
 #include "io/input-key-requester.h"
+#include "player-status/player-energy.h"
 #include "player/attack-defense-types.h"
-#include "player/player-status.h"
 #include "player/special-defense-types.h"
 #include "status/action-setter.h"
 #include "system/floor-type-definition.h"

diff --git a/src/cmd-building/cmd-building.cpp b/src/cmd-building/cmd-building.cpp
index 1fb402c..33fdafb 100644 (file)
--- a/src/cmd-building/cmd-building.cpp
+++ b/src/cmd-building/cmd-building.cpp
@@ -55,8 +55,8 @@
 #include "object-hook/hook-weapon.h"
 #include "object/item-tester-hooker.h"
 #include "player-info/avatar.h"
+#include "player-status/player-energy.h"
 #include "player/player-personality-types.h"
-#include "player/player-status.h"
 #include "spell-kind/spells-perception.h"
 #include "spell-kind/spells-world.h"
 #include "spell/spells-status.h"

diff --git a/src/cmd-item/cmd-destroy.cpp b/src/cmd-item/cmd-destroy.cpp
index 8997fc5..5b41c84 100644 (file)
--- a/src/cmd-item/cmd-destroy.cpp
+++ b/src/cmd-item/cmd-destroy.cpp
@@ -21,8 +21,8 @@
 #include "object/object-stack.h"
 #include "object/object-value.h"
 #include "player-info/avatar.h"
+#include "player-status/player-energy.h"
 #include "player/attack-defense-types.h"
-#include "player/player-status.h"
 #include "player/special-defense-types.h"
 #include "racial/racial-android.h"
 #include "realm/realm-names-table.h"

diff --git a/src/cmd-item/cmd-eat.cpp b/src/cmd-item/cmd-eat.cpp
index ae062b6..968aba3 100644 (file)
--- a/src/cmd-item/cmd-eat.cpp
+++ b/src/cmd-item/cmd-eat.cpp
@@ -24,6 +24,7 @@
 #include "object/object-kind-hook.h"
 #include "object/object-kind.h"
 #include "perception/object-perception.h"
+#include "player-status/player-energy.h"
 #include "player-info/avatar.h"
 #include "player/attack-defense-types.h"
 #include "player/digestion-processor.h"
@@ -32,7 +33,6 @@
 #include "player/player-damage.h"
 #include "player/player-race-types.h"
 #include "player/player-status-flags.h"
-#include "player/player-status.h"
 #include "player/special-defense-types.h"
 #include "spell-realm/spells-hex.h"
 #include "spell-realm/spells-song.h"

diff --git a/src/cmd-item/cmd-equipment.cpp b/src/cmd-item/cmd-equipment.cpp
index 33fbc27..9d66c88 100644 (file)
--- a/src/cmd-item/cmd-equipment.cpp
+++ b/src/cmd-item/cmd-equipment.cpp
@@ -30,6 +30,7 @@
 #include "object/object-mark-types.h"
 #include "perception/object-perception.h"
 #include "player-info/avatar.h"
+#include "player-status/player-energy.h"
 #include "player-status/player-hand-types.h"
 #include "player/attack-defense-types.h"
 #include "player/player-status.h"

diff --git a/src/cmd-item/cmd-item.cpp b/src/cmd-item/cmd-item.cpp
index 9501ab8..0bb8e70 100644 (file)
--- a/src/cmd-item/cmd-item.cpp
+++ b/src/cmd-item/cmd-item.cpp
@@ -45,6 +45,7 @@
 #include "perception/identification.h"
 #include "perception/object-perception.h"
 #include "player-info/self-info.h"
+#include "player-status/player-energy.h"
 #include "player/attack-defense-types.h"
 #include "player/player-class.h"
 #include "player/player-personality-types.h"

diff --git a/src/cmd-item/cmd-magiceat.cpp b/src/cmd-item/cmd-magiceat.cpp
index f8b1f2e..ec5f171 100644 (file)
--- a/src/cmd-item/cmd-magiceat.cpp
+++ b/src/cmd-item/cmd-magiceat.cpp
@@ -68,9 +68,9 @@
 #include "object/object-kind.h"
 #include "sv-definition/sv-other-types.h"
 #include "sv-definition/sv-rod-types.h"
+#include "player-status/player-energy.h"
 #include "player-info/avatar.h"
 #include "player/player-class.h"
-#include "player/player-status.h"
 #include "player/player-status-table.h"
 #include "spell/spell-info.h"
 #include "system/player-type-definition.h"

diff --git a/src/cmd-item/cmd-refill.cpp b/src/cmd-item/cmd-refill.cpp
index 87ab2b6..9930e39 100644 (file)
--- a/src/cmd-item/cmd-refill.cpp
+++ b/src/cmd-item/cmd-refill.cpp
@@ -8,8 +8,8 @@
 #include "object-hook/hook-expendable.h"
 #include "object/item-tester-hooker.h"
 #include "object/item-use-flags.h"
+#include "player-status/player-energy.h"
 #include "player/attack-defense-types.h"
-#include "player/player-status.h"
 #include "player/special-defense-types.h"
 #include "status/action-setter.h"
 #include "sv-definition/sv-lite-types.h"

diff --git a/src/cmd-item/cmd-smith.cpp b/src/cmd-item/cmd-smith.cpp
index ea34b5b..3ba08bd 100644 (file)
--- a/src/cmd-item/cmd-smith.cpp
+++ b/src/cmd-item/cmd-smith.cpp
@@ -31,7 +31,7 @@
 #include "object/object-flags.h" //!< @todo 相互参照している.
 #include "object/object-generator.h"
 #include "perception/object-perception.h"
-#include "player/player-status.h"
+#include "player-status/player-energy.h"
 #include "system/object-type-definition.h"
 #include "system/player-type-definition.h"
 #include "term/screen-processor.h"

diff --git a/src/cmd-item/cmd-throw.cpp b/src/cmd-item/cmd-throw.cpp
index b50ba7f..e9425ef 100644 (file)
--- a/src/cmd-item/cmd-throw.cpp
+++ b/src/cmd-item/cmd-throw.cpp
@@ -44,6 +44,7 @@
 #include "object/object-info.h"
 #include "object/object-kind.h"
 #include "object/object-stack.h"
+#include "player-status/player-energy.h"
 #include "player/attack-defense-types.h"
 #include "player/player-status-table.h"
 #include "player/player-status.h"

diff --git a/src/cmd-item/cmd-usestaff.cpp b/src/cmd-item/cmd-usestaff.cpp
index 1afe029..f8798bd 100644 (file)
--- a/src/cmd-item/cmd-usestaff.cpp
+++ b/src/cmd-item/cmd-usestaff.cpp
@@ -18,10 +18,10 @@
 #include "perception/object-perception.h"
 #include "player/attack-defense-types.h"
 #include "player-info/avatar.h"
+#include "player-status/player-energy.h"
 #include "player/player-class.h"
 #include "player/player-race-types.h"
 #include "player/player-race.h"
-#include "player/player-status.h"
 #include "player/player-status-flags.h"
 #include "player/special-defense-types.h"
 #include "spell-kind/earthquake.h"

diff --git a/src/cmd-item/cmd-zaprod.cpp b/src/cmd-item/cmd-zaprod.cpp
index 332a544..d6ece8a 100644 (file)
--- a/src/cmd-item/cmd-zaprod.cpp
+++ b/src/cmd-item/cmd-zaprod.cpp
@@ -13,8 +13,8 @@
 #include "perception/object-perception.h"
 #include "player/attack-defense-types.h"
 #include "player-info/avatar.h"
+#include "player-status/player-energy.h"
 #include "player/player-class.h"
-#include "player/player-status.h"
 #include "player/special-defense-types.h"
 #include "spell-kind/spells-beam.h"
 #include "spell-kind/spells-detection.h"

diff --git a/src/cmd-item/cmd-zapwand.cpp b/src/cmd-item/cmd-zapwand.cpp
index 652c852..7d24455 100644 (file)
--- a/src/cmd-item/cmd-zapwand.cpp
+++ b/src/cmd-item/cmd-zapwand.cpp
@@ -15,8 +15,8 @@
 #include "perception/object-perception.h"
 #include "player/attack-defense-types.h"
 #include "player-info/avatar.h"
+#include "player-status/player-energy.h"
 #include "player/player-class.h"
-#include "player/player-status.h"
 #include "player/special-defense-types.h"
 #include "spell-kind/spells-beam.h"
 #include "spell-kind/spells-charm.h"

diff --git a/src/combat/shoot.cpp b/src/combat/shoot.cpp
index 64c9e10..5d36df9 100644 (file)
--- a/src/combat/shoot.cpp
+++ b/src/combat/shoot.cpp
@@ -47,11 +47,11 @@
 #include "object/object-kind.h"
 #include "object/object-mark-types.h"
 #include "player-info/avatar.h"
+#include "player-status/player-energy.h"
 #include "player/player-class.h"
 #include "player/player-personality-types.h"
 #include "player/player-skill.h"
 #include "player/player-status-table.h"
-#include "player/player-status.h"
 #include "spell/spell-types.h"
 #include "sv-definition/sv-bow-types.h"
 #include "system/artifact-type-definition.h"

diff --git a/src/core/player-processor.cpp b/src/core/player-processor.cpp
index cde0d88..da52e35 100644 (file)
--- a/src/core/player-processor.cpp
+++ b/src/core/player-processor.cpp
@@ -37,10 +37,10 @@
 #include "monster/monster-update.h"
 #include "monster/monster-util.h"
 #include "mutation/mutation-investor-remover.h"
+#include "player-status/player-energy.h"
 #include "player/attack-defense-types.h"
 #include "player/eldritch-horror.h"
 #include "player/player-skill.h"
-#include "player/player-status.h"
 #include "player/special-defense-types.h"
 #include "spell-kind/spells-random.h"
 #include "spell-realm/spells-hex.h"

diff --git a/src/dungeon/quest.cpp b/src/dungeon/quest.cpp
index 4d09ea7..228d71b 100644 (file)
--- a/src/dungeon/quest.cpp
+++ b/src/dungeon/quest.cpp
@@ -26,6 +26,7 @@
 #include "object-enchant/item-apply-magic.h"
 #include "object-enchant/trg-types.h"
 #include "object/object-generator.h"
+#include "player-status/player-energy.h"
 #include "player/player-personality-types.h"
 #include "player/player-status.h"
 #include "system/artifact-type-definition.h"

diff --git a/src/floor/pattern-walk.cpp b/src/floor/pattern-walk.cpp
index 04ff8bc..456d0d3 100644 (file)
--- a/src/floor/pattern-walk.cpp
+++ b/src/floor/pattern-walk.cpp
@@ -12,6 +12,7 @@
 #include "grid/grid.h"
 #include "io/input-key-requester.h"
 #include "io/write-diary.h"
+#include "player-status/player-energy.h"
 #include "player/player-damage.h"
 #include "player/player-move.h"
 #include "player/player-race-types.h"

diff --git a/src/floor/wild.cpp b/src/floor/wild.cpp
index c167672..4cb8169 100644 (file)
--- a/src/floor/wild.cpp
+++ b/src/floor/wild.cpp
@@ -32,6 +32,7 @@
 #include "monster/monster-info.h"
 #include "monster/monster-status.h"
 #include "monster/monster-util.h"
+#include "player-status/player-energy.h"
 #include "player/attack-defense-types.h"
 #include "player/player-status.h"
 #include "realm/realm-names-table.h"

diff --git a/src/io/input-key-processor.cpp b/src/io/input-key-processor.cpp
index 9bd666e..948542b 100644 (file)
--- a/src/io/input-key-processor.cpp
+++ b/src/io/input-key-processor.cpp
@@ -75,6 +75,7 @@
 #include "mind/mind-magic-eater.h"
 #include "mind/mind-sniper.h"
 #include "mind/snipe-types.h"
+#include "player-status/player-energy.h"
 #include "player/attack-defense-types.h"
 #include "player/digestion-processor.h"
 #include "player/player-class.h"

diff --git a/src/mind/mind-blue-mage.cpp b/src/mind/mind-blue-mage.cpp
index 4cdc5d4..ef5d654 100644 (file)
--- a/src/mind/mind-blue-mage.cpp
+++ b/src/mind/mind-blue-mage.cpp
@@ -12,8 +12,8 @@
 #include "monster-race/race-ability-mask.h"
 #include "mspell/monster-power-table.h"
 #include "player-info/avatar.h"
+#include "player-status/player-energy.h"
 #include "player/player-status-table.h"
-#include "player/player-status.h"
 #include "realm/realm-types.h"
 #include "spell/spell-info.h"
 #include "status/bad-status-setter.h"

diff --git a/src/mind/mind-elementalist.cpp b/src/mind/mind-elementalist.cpp
index 358d710..6de3674 100644 (file)
--- a/src/mind/mind-elementalist.cpp
+++ b/src/mind/mind-elementalist.cpp
@@ -37,6 +37,7 @@
 #include "monster-race/race-flags7.h"
 #include "monster/monster-describer.h"
 #include "player-info/avatar.h"
+#include "player-status/player-energy.h"
 #include "player-status/player-status-base.h"
 #include "player/player-status-table.h"
 #include "player/player-status.h"

diff --git a/src/mind/mind-magic-eater.cpp b/src/mind/mind-magic-eater.cpp
index d1ece47..6bae8fe 100644 (file)
--- a/src/mind/mind-magic-eater.cpp
+++ b/src/mind/mind-magic-eater.cpp
@@ -6,7 +6,7 @@
 #include "object/item-tester-hooker.h"
 #include "object/item-use-flags.h"
 #include "perception/object-perception.h"
-#include "player/player-status.h"
+#include "player-status/player-energy.h"
 #include "sv-definition/sv-staff-types.h"
 #include "system/object-type-definition.h"
 #include "system/player-type-definition.h"

diff --git a/src/mind/mind-ninja.cpp b/src/mind/mind-ninja.cpp
index b65cf2b..e3de163 100644 (file)
--- a/src/mind/mind-ninja.cpp
+++ b/src/mind/mind-ninja.cpp
@@ -29,6 +29,7 @@
 #include "object/object-kind-hook.h"
 #include "player-attack/player-attack-util.h"
 #include "player/attack-defense-types.h"
+#include "player-status/player-energy.h"
 #include "player/player-status-flags.h"
 #include "player/player-status.h"
 #include "player/special-defense-types.h"

diff --git a/src/mind/mind-sniper.cpp b/src/mind/mind-sniper.cpp
index b60fd11..8bd62cf 100644 (file)
--- a/src/mind/mind-sniper.cpp
+++ b/src/mind/mind-sniper.cpp
@@ -25,7 +25,7 @@
 #include "monster-race/race-flags-resistance.h"
 #include "monster-race/race-flags3.h"
 #include "monster-race/monster-race.h"
-#include "player/player-status.h"
+#include "player-status/player-energy.h"
 #include "system/monster-race-definition.h"
 #include "system/monster-type-definition.h"
 #include "system/object-type-definition.h"

diff --git a/src/object-use/quaff-execution.cpp b/src/object-use/quaff-execution.cpp
index 6363213..c4eb02a 100644 (file)
--- a/src/object-use/quaff-execution.cpp
+++ b/src/object-use/quaff-execution.cpp
@@ -20,15 +20,15 @@
 #include "object/object-info.h"
 #include "object/object-kind.h"
 #include "perception/object-perception.h"
+#include "player-info/avatar.h"
 #include "player-info/self-info.h"
+#include "player-status/player-energy.h"
 #include "player/attack-defense-types.h"
-#include "player-info/avatar.h"
-#include "player/player-status-flags.h"
 #include "player/digestion-processor.h"
 #include "player/eldritch-horror.h"
 #include "player/mimic-info-table.h"
 #include "player/player-damage.h"
-#include "player/player-status.h"
+#include "player/player-status-flags.h"
 #include "realm/realm-hex-numbers.h"
 #include "spell-kind/spells-detection.h"
 #include "spell-kind/spells-floor.h"

diff --git a/src/object-use/read-execution.cpp b/src/object-use/read-execution.cpp
index 4281428..b777c37 100644 (file)
--- a/src/object-use/read-execution.cpp
+++ b/src/object-use/read-execution.cpp
@@ -25,6 +25,7 @@
 #include "object/object-kind.h"
 #include "perception/object-perception.h"
 #include "player-info/avatar.h"
+#include "player-status/player-energy.h"
 #include "player/attack-defense-types.h"
 #include "player/digestion-processor.h"
 #include "player/player-damage.h"

diff --git a/src/player-status/player-energy.cpp b/src/player-status/player-energy.cpp
new file mode 100644 (file)
index 0000000..34606e0
--- /dev/null
+++ b/src/player-status/player-energy.cpp
@@ -0,0 +1,20 @@
+/*
+ * @file player-energy.cpp
+ * @brief ゲームターン当たりの行動エネルギー増減処理
+ * @author Hourier
+ * @date 2021/04/29
+ */
+
+#include "player-status/player-energy.h"
+#include "system/player-type-definition.h"
+
+// todo 第3引数 (演算：代入、加算、減算、他)を導入する。enumを使う
+void take_turn(player_type *creature_ptr, PERCENTAGE need_cost)
+{
+    creature_ptr->energy_use = (ENERGY)need_cost;
+}
+
+void free_turn(player_type *creature_ptr)
+{
+    creature_ptr->energy_use = 0;
+}

diff --git a/src/player-status/player-energy.h b/src/player-status/player-energy.h
new file mode 100644 (file)
index 0000000..edb251e
--- /dev/null
+++ b/src/player-status/player-energy.h
@@ -0,0 +1,7 @@
+#pragma once
+
+#include "system/angband.h"
+
+typedef struct player_type player_type;
+void take_turn(player_type *creature_ptr, PERCENTAGE need_cost);
+void free_turn(player_type *creature_ptr);

diff --git a/src/player/player-move.cpp b/src/player/player-move.cpp
index 79033cd..0912e48 100644 (file)
--- a/src/player/player-move.cpp
+++ b/src/player/player-move.cpp
@@ -29,6 +29,7 @@
 #include "mind/mind-ninja.h"
 #include "monster/monster-update.h"
 #include "perception/object-perception.h"
+#include "player-status/player-energy.h"
 #include "player/attack-defense-types.h"
 #include "player/player-status-flags.h"
 #include "player/player-status.h"

diff --git a/src/player/player-status.cpp b/src/player/player-status.cpp
index c2f1403..cccdbd1 100644 (file)
--- a/src/player/player-status.cpp
+++ b/src/player/player-status.cpp
@@ -2845,16 +2845,6 @@ bool player_has_no_spellbooks(player_type *creature_ptr)
     return TRUE;
 }
 
-void take_turn(player_type *creature_ptr, PERCENTAGE need_cost)
-{
-    creature_ptr->energy_use = (ENERGY)need_cost;
-}
-
-void free_turn(player_type *creature_ptr)
-{
-    creature_ptr->energy_use = 0;
-}
-
 /*!
  * @brief プレイヤーを指定座標に配置する / Place the player in the dungeon XXX XXX
  * @param x 配置先X座標

diff --git a/src/player/player-status.h b/src/player/player-status.h
index 297374f..947f945 100644 (file)
--- a/src/player/player-status.h
+++ b/src/player/player-status.h
@@ -26,9 +26,6 @@ void update_creature(player_type *creature_ptr);
 BIT_FLAGS16 empty_hands(player_type *creature_ptr, bool riding_control);
 bool player_has_no_spellbooks(player_type *creature_ptr);
 
-void take_turn(player_type *creature_ptr, PERCENTAGE need_cost);
-void free_turn(player_type *creature_ptr);
-
 bool player_place(player_type *creature_ptr, POSITION y, POSITION x);
 
 void check_experience(player_type *creature_ptr);

diff --git a/src/racial/racial-switcher.cpp b/src/racial/racial-switcher.cpp
index 47cb982..bf5c496 100644 (file)
--- a/src/racial/racial-switcher.cpp
+++ b/src/racial/racial-switcher.cpp
@@ -46,6 +46,7 @@
 #include "mind/stances-table.h"
 #include "mutation/mutation-flag-types.h"
 #include "object/item-tester-hooker.h"
+#include "player-status/player-energy.h"
 #include "player-status/player-hand-types.h"
 #include "player/attack-defense-types.h"
 #include "player/player-class.h"

diff --git a/src/spell/spells-status.cpp b/src/spell/spells-status.cpp
index 6c03e4d..4fd9357 100644 (file)
--- a/src/spell/spells-status.cpp
+++ b/src/spell/spells-status.cpp
@@ -28,9 +28,9 @@
 #include "object/object-kind-hook.h"
 #include "object/object-kind.h"
 #include "player-info/avatar.h"
+#include "player-status/player-energy.h"
 #include "player/attack-defense-types.h"
 #include "player/player-class.h"
-#include "player/player-status.h"
 #include "spell-kind/spells-launcher.h"
 #include "spell-kind/spells-teleport.h"
 #include "spell-kind/spells-world.h"

diff --git a/src/status/action-setter.cpp b/src/status/action-setter.cpp
index de7ea0d..38e86fc 100644 (file)
--- a/src/status/action-setter.cpp
+++ b/src/status/action-setter.cpp
@@ -14,8 +14,8 @@
 #include "status/action-setter.h"
 #include "core/player-redraw-types.h"
 #include "core/player-update-types.h"
+#include "player-status/player-energy.h"
 #include "player/attack-defense-types.h"
-#include "player/player-status.h"
 #include "player/special-defense-types.h"
 #include "spell-realm/spells-hex.h"
 #include "spell-realm/spells-song.h"

diff --git a/src/store/cmd-store.cpp b/src/store/cmd-store.cpp
index 98fb458..819a669 100644 (file)
--- a/src/store/cmd-store.cpp
+++ b/src/store/cmd-store.cpp
@@ -20,7 +20,7 @@
 #include "main/sound-of-music.h"
 #include "object/object-generator.h"
 #include "object/object-info.h"
-#include "player/player-status.h"
+#include "player-status/player-energy.h"
 #include "store/cmd-store.h"
 #include "store/home.h"
 #include "store/store-key-processor.h"

diff --git a/src/wizard/wizard-special-process.cpp b/src/wizard/wizard-special-process.cpp
index 9f17f63..7a57f72 100644 (file)
--- a/src/wizard/wizard-special-process.cpp
+++ b/src/wizard/wizard-special-process.cpp
@@ -56,6 +56,7 @@
 #include "object/object-kind.h"
 #include "perception/object-perception.h"
 #include "player-info/self-info.h"
+#include "player-status/player-energy.h"
 #include "player/digestion-processor.h"
 #include "player/patron.h"
 #include "player/player-class.h"

diff --git a/src/world/world-turn-processor.cpp b/src/world/world-turn-processor.cpp
index 1a461f5..cdd18e4 100644 (file)
--- a/src/world/world-turn-processor.cpp
+++ b/src/world/world-turn-processor.cpp
@@ -27,8 +27,8 @@
 #include "mutation/mutation-processor.h"
 #include "object/lite-processor.h"
 #include "perception/simple-perception.h"
+#include "player-status/player-energy.h"
 #include "player/digestion-processor.h"
-#include "player/player-status.h"
 #include "store/store-owners.h"
 #include "store/store-util.h"
 #include "store/store.h"