[Refactor] #39963 Separated effect-player-util.h from effect-player.c

diff --git a/Hengband_vcs2017/Hengband/Hengband.vcxproj b/Hengband_vcs2017/Hengband/Hengband.vcxproj
index cb0e933..2e69ee5 100644 (file)
--- a/Hengband_vcs2017/Hengband/Hengband.vcxproj
+++ b/Hengband_vcs2017/Hengband/Hengband.vcxproj
@@ -348,6 +348,7 @@
     <ClInclude Include="..\..\src\effect\effect-monster-switcher.h" />\r
     <ClInclude Include="..\..\src\effect\effect-monster-util.h" />\r
     <ClInclude Include="..\..\src\effect\effect-monster.h" />\r
+    <ClInclude Include="..\..\src\effect\effect-player-util.h" />\r
     <ClInclude Include="..\..\src\effect\effect-player.h" />\r
     <ClInclude Include="..\..\src\effect\spells-effect-util.h" />\r
     <ClInclude Include="..\..\src\io\dump-remover.h" />\r

diff --git a/Hengband_vcs2017/Hengband/Hengband.vcxproj.filters b/Hengband_vcs2017/Hengband/Hengband.vcxproj.filters
index ff86b1f..89c1461 100644 (file)
--- a/Hengband_vcs2017/Hengband/Hengband.vcxproj.filters
+++ b/Hengband_vcs2017/Hengband/Hengband.vcxproj.filters
@@ -1439,6 +1439,9 @@
     <ClInclude Include="..\..\src\spell\spells-type.h">
       <Filter>spell</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\effect\effect-player-util.h">
+      <Filter>effect</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\src\wall.bmp" />

diff --git a/src/Makefile.am b/src/Makefile.am
index e9c5252..c8b897f 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -172,6 +172,7 @@ hengband_SOURCES = \
        effect/effect-monster.c effect/effect-monster.h \
        effect/effect-monster-util.c effect/effect-monster-util.h \
        effect/effect-monster-switcher.c effect/effect-monster-switcher.h \
+       effect/effect-player-util.h \
        \
        spell/technic-info-table.c spell/technic-info-table.h \
        spell/spells-execution.c spell/spells-execution.h \

diff --git a/src/effect/effect-player-util.h b/src/effect/effect-player-util.h
new file mode 100644 (file)
index 0000000..33d6bf6
--- /dev/null
+++ b/src/effect/effect-player-util.h
@@ -0,0 +1,16 @@
+#pragma once
+
+typedef struct
+{
+       DEPTH rlev; // モンスターのレベル (但し0のモンスターは1になる).
+       monster_type *m_ptr;
+       char killer[80];
+       GAME_TEXT m_name[MAX_NLEN];
+       int get_damage;
+
+       MONSTER_IDX who;
+       HIT_POINT dam;
+       EFFECT_ID effect_type;
+       BIT_FLAGS flag;
+       int monspell;
+} effect_player_type;

diff --git a/src/effect/effect-player.c b/src/effect/effect-player.c
index c548b02..96f17d4 100644 (file)
--- a/src/effect/effect-player.c
+++ b/src/effect/effect-player.c
@@ -6,6 +6,7 @@
  */
 
 #include "angband.h"
+#include "effect/effect-player-util.h"
 #include "effect/effect-player.h"
 #include "main/sound-definitions-table.h"
 #include "player-damage.h"
@@ -23,21 +24,6 @@
 #include "object-curse.h"
 #include "spell/spells-type.h"
 
-typedef struct
-{
-       DEPTH rlev; // モンスターのレベル (但し0のモンスターは1になる).
-       monster_type *m_ptr;
-       char killer[80];
-       GAME_TEXT m_name[MAX_NLEN];
-       int get_damage;
-
-       MONSTER_IDX who;
-       HIT_POINT dam;
-       EFFECT_ID effect_type;
-       BIT_FLAGS flag;
-       int monspell;
-} effect_player_type;
-
 typedef enum effect_player_check_result
 {
        EP_CHECK_FALSE = 0,
@@ -146,7 +132,7 @@ static ep_check_result check_continue_player_effect(player_type *target_ptr, eff
        if ((ep_ptr->who == 0) || (ep_ptr->who == target_ptr->riding))
                return EP_CHECK_FALSE;
 
-       if (process_bolt_reflection(target_ptr, ep_ptr, ep_ptr->flag))
+       if (process_bolt_reflection(target_ptr, ep_ptr))
                return EP_CHECK_TRUE;
 
        return EP_CHECK_CONTINUE;