• R/O
  • HTTP
  • SSH
  • HTTPS

hengband: コミット

変愚蛮怒のメインリポジトリです


コミットメタ情報

リビジョン8f9f7334a366c484e80624ce48063cfcf9630c7f (tree)
日時2020-05-23 22:21:13
作者Hourier <hourier@user...>
コミッターHourier

ログメッセージ

[Refactor] #40416 Renamed melee.c/h to melee-postprocess.c/h

変更サマリ

差分

--- a/Hengband/Hengband/Hengband.vcxproj
+++ b/Hengband/Hengband/Hengband.vcxproj
@@ -317,7 +317,7 @@
317317 <ClCompile Include="..\..\src\cmd\lighting-level-table.c" />
318318 <ClCompile Include="..\..\src\cmd\monster-group-table.c" />
319319 <ClCompile Include="..\..\src\cmd\object-group-table.c" />
320- <ClCompile Include="..\..\src\combat\melee.c" />
320+ <ClCompile Include="..\..\src\combat\melee-postprocess.c" />
321321 <ClCompile Include="..\..\src\combat\shoot.c" />
322322 <ClCompile Include="..\..\src\mspell\mspell-bolt.c" />
323323 <ClCompile Include="..\..\src\mspell\mspell-breath.c" />
@@ -691,7 +691,7 @@
691691 <ClInclude Include="..\..\src\cmd\lighting-level-table.h" />
692692 <ClInclude Include="..\..\src\cmd\monster-group-table.h" />
693693 <ClInclude Include="..\..\src\cmd\object-group-table.h" />
694- <ClInclude Include="..\..\src\combat\melee.h" />
694+ <ClInclude Include="..\..\src\combat\melee-postprocess.h" />
695695 <ClInclude Include="..\..\src\combat\shoot.h" />
696696 <ClInclude Include="..\..\src\core\show-file.h" />
697697 <ClInclude Include="..\..\src\view\display-birth.h" />
--- a/Hengband/Hengband/Hengband.vcxproj.filters
+++ b/Hengband/Hengband/Hengband.vcxproj.filters
@@ -263,9 +263,6 @@
263263 <ClCompile Include="..\..\src\knowledge\knowledge-mutations.c">
264264 <Filter>knowledge</Filter>
265265 </ClCompile>
266- <ClCompile Include="..\..\src\combat\melee.c">
267- <Filter>combat</Filter>
268- </ClCompile>
269266 <ClCompile Include="..\..\src\autopick\autopick.c">
270267 <Filter>autopick</Filter>
271268 </ClCompile>
@@ -1034,6 +1031,9 @@
10341031 <ClCompile Include="..\..\src\combat\monster-attack-monster.c">
10351032 <Filter>combat</Filter>
10361033 </ClCompile>
1034+ <ClCompile Include="..\..\src\combat\melee-postprocess.c">
1035+ <Filter>combat</Filter>
1036+ </ClCompile>
10371037 </ItemGroup>
10381038 <ItemGroup>
10391039 <ClInclude Include="..\..\src\cmd\cmd-activate.h">
@@ -1087,9 +1087,6 @@
10871087 <ClInclude Include="..\..\src\cmd\cmd-zapwand.h">
10881088 <Filter>cmd</Filter>
10891089 </ClInclude>
1090- <ClInclude Include="..\..\src\combat\melee.h">
1091- <Filter>combat</Filter>
1092- </ClInclude>
10931090 <ClInclude Include="..\..\src\combat\shoot.h">
10941091 <Filter>combat</Filter>
10951092 </ClInclude>
@@ -2140,6 +2137,9 @@
21402137 <ClInclude Include="..\..\src\combat\monster-attack-monster.h">
21412138 <Filter>combat</Filter>
21422139 </ClInclude>
2140+ <ClInclude Include="..\..\src\combat\melee-postprocess.h">
2141+ <Filter>combat</Filter>
2142+ </ClInclude>
21432143 </ItemGroup>
21442144 <ItemGroup>
21452145 <None Include="..\..\src\wall.bmp" />
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -340,7 +340,6 @@ hengband_SOURCES = \
340340 cmd/cmd-attack.c cmd/cmd-attack.h \
341341 \
342342 combat/player-attack-util.h \
343- combat/melee.h combat/melee.c \
344343 combat/attack-power-table.c combat/attack-power-table.h \
345344 combat/hallucination-attacks-table.c combat/hallucination-attacks-table.h \
346345 combat/monster-attack-types.c combat/monster-attack-types.h \
@@ -358,6 +357,7 @@ hengband_SOURCES = \
358357 combat/attack-chaos-effect.c combat/attack-chaos-effect.h \
359358 combat/monster-attack-player.c combat/monster-attack-player.h \
360359 combat/monster-attack-monster.c combat/monster-attack-monster.h \
360+ combat/melee-postprocess.c combat/melee-postprocess.h \
361361 combat/shoot.c combat/shoot.h \
362362 combat/snipe.c combat/snipe.h \
363363 \
--- a/src/combat/melee.c
+++ b/src/combat/melee-postprocess.c
@@ -1,6 +1,5 @@
11 /*!
2- * @file melee1.c
3- * @brief 打撃処理 / Melee process.
2+ * @brief モンスター同士の打撃後処理 / Melee post-process.
43 * @date 2014/01/17
54 * @author
65 * Copyright (c) 1997 Ben Harrison, James E. Wilson, Robert A. Koeneke\n
@@ -16,7 +15,7 @@
1615 #include "main/sound-definitions-table.h"
1716 #include "cmd-pet.h"
1817 #include "monster/monsterrace-hook.h"
19-#include "melee.h"
18+#include "combat/melee-postprocess.h"
2019 #include "monster/monster.h"
2120 #include "monster/monster-status.h"
2221 #include "mspell/monster-spell.h"
@@ -27,7 +26,6 @@
2726 #include "player/player-personalities-table.h"
2827 #include "player/player-races-table.h"
2928 #include "combat/monster-attack-types.h"
30-#include "mind/samurai-slaying.h"
3129
3230 /*!
3331 * todo 打撃が当たった時の後処理 (爆発持ちのモンスターを爆発させる等)なので、関数名を変更する必要あり
--- a/src/combat/monster-attack-monster.c
+++ b/src/combat/monster-attack-monster.c
@@ -13,7 +13,7 @@
1313 #include "spell/process-effect.h"
1414 #include "monster/monsterrace-hook.h"
1515 #include "realm/realm-hex.h"
16-#include "combat/melee.h"
16+#include "combat/melee-postprocess.h"
1717
1818 #define BLOW_EFFECT_TYPE_NONE 0
1919 #define BLOW_EFFECT_TYPE_FEAR 1
--- a/src/mind/racial.c
+++ b/src/mind/racial.c
@@ -19,7 +19,7 @@
1919 #include "cmd-magiceat.h"
2020 #include "cmd-mane.h"
2121 #include "cmd-zapwand.h"
22-#include "melee.h"
22+#include "combat/melee-postprocess.h"
2323 #include "object/object-hook.h"
2424
2525 #include "mutation/mutation.h"
--- a/src/monster/monster-process.c
+++ b/src/monster/monster-process.c
@@ -26,7 +26,7 @@
2626 #include "cmd/cmd-dump.h"
2727 #include "cmd/cmd-pet.h"
2828 #include "monster/creature.h"
29-#include "melee.h"
29+#include "combat/melee-postprocess.h"
3030 #include "spell/spells-summon.h"
3131 #include "player/avatar.h"
3232 #include "realm/realm-hex.h"
--- a/src/monster/monster1.c
+++ b/src/monster/monster1.c
@@ -33,7 +33,7 @@
3333 #include "floor/wild.h"
3434 #include "dungeon/dungeon.h"
3535 #include "world/world.h"
36-#include "melee.h"
36+#include "combat/melee-postprocess.h"
3737 #include "locale/japanese.h"
3838 #include "view/display-main-window.h"
3939 #include "player/player-class.h"
--- a/src/mspell/mspell-special.c
+++ b/src/mspell/mspell-special.c
@@ -16,7 +16,7 @@
1616 #include "spell/spells3.h"
1717 #include "spell/process-effect.h"
1818 #include "player/player-effects.h"
19-#include "combat/melee.h"
19+#include "combat/melee-postprocess.h"
2020
2121 /*!
2222 * @brief バーノール・ルパートのRF6_SPECIALの処理。分裂・合体。 /
旧リポジトリブラウザで表示