[Refactor] hengband#1498 Created timed-effect/ for separating timed-e…

…ffect variables from player_type
Hourier · Sep 18, 2021 · 202115e · 202115e
1 parent 28a42a6
commit 202115e
Show file tree

Hide file tree

Showing 9 changed files with 82 additions and 3 deletions.
diff --git a/Hengband/Hengband/Hengband.vcxproj b/Hengband/Hengband/Hengband.vcxproj
@@ -566,6 +566,8 @@
     <ClCompile Include="..\..\src\target\target-getter.cpp" />
     <ClCompile Include="..\..\src\target\target-preparation.cpp" />
     <ClCompile Include="..\..\src\target\target-setter.cpp" />
+    <ClCompile Include="..\..\src\timed-effect\player-stun.cpp" />
+    <ClCompile Include="..\..\src\timed-effect\timed-effects.cpp" />
     <ClCompile Include="..\..\src\view\display-inventory.cpp" />
     <ClCompile Include="..\..\src\view\display-map.cpp" />
     <ClCompile Include="..\..\src\view\display-self-info.cpp" />
@@ -1291,6 +1293,8 @@
     <ClInclude Include="..\..\src\target\target-setter.h" />
     <ClInclude Include="..\..\src\target\target-types.h" />
     <ClInclude Include="..\..\src\term\screen-processor.h" />
+    <ClInclude Include="..\..\src\timed-effect\player-stun.h" />
+    <ClInclude Include="..\..\src\timed-effect\timed-effects.h" />
     <ClInclude Include="..\..\src\util\bit-flags-calculator.h" />
     <ClInclude Include="..\..\src\util\buffer-shaper.h" />
     <ClInclude Include="..\..\src\util\enum-converter.h" />

diff --git a/Hengband/Hengband/Hengband.vcxproj.filters b/Hengband/Hengband/Hengband.vcxproj.filters
@@ -2331,6 +2331,12 @@
     <ClCompile Include="..\..\src\object-enchant\smith-info.cpp">
       <Filter>object-enchant</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\timed-effect\timed-effects.cpp">
+      <Filter>timed-effect</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\timed-effect\player-stun.cpp">
+      <Filter>timed-effect</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\src\combat\shoot.h">
@@ -5016,6 +5022,12 @@
     <ClInclude Include="..\..\src\object-enchant\smith-info.h">
       <Filter>object-enchant</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\timed-effect\timed-effects.h">
+      <Filter>timed-effect</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\timed-effect\player-stun.h">
+      <Filter>timed-effect</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\src\wall.bmp" />
@@ -5235,6 +5247,9 @@
     <Filter Include="player-base">
       <UniqueIdentifier>{0bd4660d-028e-44be-a5fe-c7cc7d3d00c2}</UniqueIdentifier>
     </Filter>
+    <Filter Include="timed-effect">
+      <UniqueIdentifier>{b9e618e1-f780-4f5f-9413-d0270ac53660}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\..\src\angband.rc" />

diff --git a/src/Makefile.am b/src/Makefile.am
@@ -872,6 +872,9 @@ hengband_SOURCES = \
 	term/z-term.cpp term/z-term.h term/z-util.cpp term/z-util.h \
 	term/z-virt.cpp term/z-virt.h \
 	\
+	timed-effect/player-stun.cpp timed-effect/player-stun.h \
+	timed-effect/timed-effects.cpp timed-effect/timed-effects.h \
+	\
 	util/angband-files.cpp util/angband-files.h \
 	util/buffer-shaper.cpp util/buffer-shaper.h \
 	util/bit-flags-calculator.h \

diff --git a/src/system/player-type-definition.cpp b/src/system/player-type-definition.cpp
@@ -9,3 +9,8 @@ player_type p_body;
  * @brief プレイヤー構造体へのグローバル参照ポインタ / Pointer to the player info
  */
 player_type *p_ptr = &p_body;
+
+std::shared_ptr<TimedEffects> player_type::effects() const
+{
+    return this->timed_effects;
+}
diff --git a/src/system/player-type-definition.h b/src/system/player-type-definition.h
@@ -10,6 +10,7 @@
 #include "player/player-sex.h"
 #include "system/angband.h"
 #include "system/system-variables.h"
+#include "timed-effect/timed-effects.h"
 #include "util/flag-group.h"
 
 #define MAX_SKILLS 10
@@ -19,8 +20,9 @@ enum class RF_ABILITY;
 
 struct floor_type;
 struct object_type;
-;
-typedef struct player_type {
+class TimedEffects;
+struct player_type {
+public:
     int player_uid{};
     int player_euid{};
     int player_egid{};
@@ -423,6 +425,11 @@ typedef struct player_type {
     POSITION x{}; /*!< ダンジョンの現在X座標 / Player location in dungeon */
     GAME_TEXT name[32]{}; /*!< 現在のプレイヤー名 / Current player's character name */
     char base_name[32]{}; /*!< Stripped version of "player_name" */
-} player_type;
+
+    std::shared_ptr<TimedEffects> effects() const;
+
+private:
+    std::shared_ptr<TimedEffects> timed_effects = std::shared_ptr<TimedEffects>(new TimedEffects());
+};
 
 extern player_type *p_ptr;
diff --git a/src/timed-effect/player-stun.cpp b/src/timed-effect/player-stun.cpp
@@ -0,0 +1,10 @@
+#include "timed-effect/player-stun.h"
+
+short PlayerStun::current()
+{
+    return this->stun;
+}
+
+void PlayerStun::set(short value)
+{
+}
diff --git a/src/timed-effect/player-stun.h b/src/timed-effect/player-stun.h
@@ -0,0 +1,13 @@
+#pragma once
+
+class PlayerStun {
+public:
+    PlayerStun() = default;
+    virtual ~PlayerStun() = default;
+
+    short current();
+    void set(short value);
+
+private:
+    short stun = 0;
+};
diff --git a/src/timed-effect/timed-effects.cpp b/src/timed-effect/timed-effects.cpp
@@ -0,0 +1,6 @@
+#include "timed-effect/timed-effects.h"
+
+std::shared_ptr<PlayerStun> TimedEffects::stun() const
+{
+    return this->player_stun;
+}
diff --git a/src/timed-effect/timed-effects.h b/src/timed-effect/timed-effects.h
@@ -0,0 +1,16 @@
+#pragma once
+
+#include "timed-effect/player-stun.h"
+#include <memory>
+
+class PlayerStun;
+class TimedEffects {
+public:
+    TimedEffects() = default;
+    virtual ~TimedEffects() = default;
+
+    std::shared_ptr<PlayerStun> stun() const;
+
+private:
+    std::shared_ptr<PlayerStun> player_stun = std::shared_ptr<PlayerStun>(new PlayerStun());
+};