[Refactor] #2291 「配列等のテーブル類はファイル名の末尾をtableにする」という命名規則を外れてtypes になっていたmonster-attack...

diff --git a/Hengband/Hengband/Hengband.vcxproj b/Hengband/Hengband/Hengband.vcxproj
index 5c34a41..c6bc6d3 100644 (file)
--- a/Hengband/Hengband/Hengband.vcxproj
+++ b/Hengband/Hengband/Hengband.vcxproj
@@ -633,7 +633,7 @@
     <ClCompile Include="..\..\src\monster-attack\monster-attack-player.cpp" />\r
     <ClCompile Include="..\..\src\monster-attack\monster-attack-status.cpp" />\r
     <ClCompile Include="..\..\src\monster-attack\monster-attack-switcher.cpp" />\r
-    <ClCompile Include="..\..\src\monster-attack\monster-attack-types.cpp" />\r
+    <ClCompile Include="..\..\src\monster-attack\monster-attack-table.cpp" />\r
     <ClCompile Include="..\..\src\combat\attack-accuracy.cpp" />\r
     <ClCompile Include="..\..\src\monster-attack\monster-eating.cpp" />\r
     <ClCompile Include="..\..\src\player-attack\player-attack.cpp" />\r
@@ -1411,7 +1411,7 @@
     <ClInclude Include="..\..\src\monster-attack\monster-attack-player.h" />\r
     <ClInclude Include="..\..\src\monster-attack\monster-attack-status.h" />\r
     <ClInclude Include="..\..\src\monster-attack\monster-attack-switcher.h" />\r
-    <ClInclude Include="..\..\src\monster-attack\monster-attack-types.h" />\r
+    <ClInclude Include="..\..\src\monster-attack\monster-attack-table.h" />\r
     <ClInclude Include="..\..\src\combat\attack-accuracy.h" />\r
     <ClInclude Include="..\..\src\monster-attack\monster-eating.h" />\r
     <ClInclude Include="..\..\src\player-attack\player-attack-util.h" />\r

diff --git a/Hengband/Hengband/Hengband.vcxproj.filters b/Hengband/Hengband/Hengband.vcxproj.filters
index 3fd8ae0..8e08e5e 100644 (file)
--- a/Hengband/Hengband/Hengband.vcxproj.filters
+++ b/Hengband/Hengband/Hengband.vcxproj.filters
@@ -950,7 +950,7 @@
     <ClCompile Include="..\..\src\monster-attack\monster-attack-switcher.cpp">\r
       <Filter>monster-attack</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="..\..\src\monster-attack\monster-attack-types.cpp">\r
+    <ClCompile Include="..\..\src\monster-attack\monster-attack-table.cpp">\r
       <Filter>monster-attack</Filter>\r
     </ClCompile>\r
     <ClCompile Include="..\..\src\monster-attack\monster-eating.cpp">\r
@@ -3467,7 +3467,7 @@
     <ClInclude Include="..\..\src\monster-attack\monster-attack-switcher.h">\r
       <Filter>monster-attack</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="..\..\src\monster-attack\monster-attack-types.h">\r
+    <ClInclude Include="..\..\src\monster-attack\monster-attack-table.h">\r
       <Filter>monster-attack</Filter>\r
     </ClInclude>\r
     <ClInclude Include="..\..\src\monster-attack\monster-eating.h">\r

diff --git a/src/Makefile.am b/src/Makefile.am
index 9f9f154..7da86e4 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -482,7 +482,7 @@ hengband_SOURCES = \
        monster-attack/monster-attack-processor.cpp monster-attack/monster-attack-processor.h \
        monster-attack/monster-attack-status.cpp monster-attack/monster-attack-status.h \
        monster-attack/monster-attack-switcher.cpp monster-attack/monster-attack-switcher.h \
-       monster-attack/monster-attack-types.cpp monster-attack/monster-attack-types.h \
+       monster-attack/monster-attack-table.cpp monster-attack/monster-attack-table.h \
        monster-attack/monster-eating.cpp monster-attack/monster-eating.h \
        \
        monster-floor/monster-death.cpp monster-floor/monster-death.h \

diff --git a/src/info-reader/race-info-tokens-table.cpp b/src/info-reader/race-info-tokens-table.cpp
index 6d9aa9f..d658eb4 100644 (file)
--- a/src/info-reader/race-info-tokens-table.cpp
+++ b/src/info-reader/race-info-tokens-table.cpp
@@ -1,6 +1,6 @@
 #include "info-reader/race-info-tokens-table.h"
 #include "monster-attack/monster-attack-effect.h"
-#include "monster-attack/monster-attack-types.h"
+#include "monster-attack/monster-attack-table.h"
 #include "monster-race/race-ability-flags.h"
 #include "monster-race/race-kind-flags.h"
 #include "monster-race/race-visual-flags.h"

diff --git a/src/info-reader/race-info-tokens-table.h b/src/info-reader/race-info-tokens-table.h
index 991728b..ff80efb 100644 (file)
--- a/src/info-reader/race-info-tokens-table.h
+++ b/src/info-reader/race-info-tokens-table.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "monster-attack/monster-attack-effect.h"
-#include "monster-attack/monster-attack-types.h"
+#include "monster-attack/monster-attack-table.h"
 #include "monster-race/monster-aura-types.h"
 #include "monster-race/race-ability-flags.h"
 #include "monster-race/race-behavior-flags.h"

diff --git a/src/lore/combat-types-setter.cpp b/src/lore/combat-types-setter.cpp
index 442e1ce..d038ec7 100644 (file)
--- a/src/lore/combat-types-setter.cpp
+++ b/src/lore/combat-types-setter.cpp
@@ -1,7 +1,7 @@
 #include "lore/combat-types-setter.h"
 #include "lore/lore-util.h"
 #include "monster-attack/monster-attack-effect.h"
-#include "monster-attack/monster-attack-types.h"
+#include "monster-attack/monster-attack-table.h"
 #include "system/monster-race-definition.h"
 #include "term/term-color-types.h"
 

diff --git a/src/lore/lore-util.cpp b/src/lore/lore-util.cpp
index a2be20c..a1a8948 100644 (file)
--- a/src/lore/lore-util.cpp
+++ b/src/lore/lore-util.cpp
@@ -1,6 +1,6 @@
 #include "lore/lore-util.h"
 #include "game-option/birth-options.h"
-#include "monster-attack/monster-attack-types.h"
+#include "monster-attack/monster-attack-table.h"
 #include "monster-race/monster-race.h"
 #include "system/monster-race-definition.h"
 #include "term/screen-processor.h"

diff --git a/src/lore/lore-util.h b/src/lore/lore-util.h
index 8efab62..1e0e1a8 100644 (file)
--- a/src/lore/lore-util.h
+++ b/src/lore/lore-util.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "monster-attack/monster-attack-types.h"
+#include "monster-attack/monster-attack-table.h"
 #include "monster-race/monster-aura-types.h"
 #include "monster-race/race-ability-flags.h"
 #include "monster-race/race-behavior-flags.h"

diff --git a/src/melee/melee-postprocess.cpp b/src/melee/melee-postprocess.cpp
index 4f8229e..c9d75f2 100644 (file)
--- a/src/melee/melee-postprocess.cpp
+++ b/src/melee/melee-postprocess.cpp
@@ -19,7 +19,7 @@
 #include "grid/grid.h"
 #include "main/sound-definitions-table.h"
 #include "main/sound-of-music.h"
-#include "monster-attack/monster-attack-types.h"
+#include "monster-attack/monster-attack-table.h"
 #include "monster-floor/monster-death.h"
 #include "monster-floor/monster-move.h"
 #include "monster-floor/monster-remover.h"

diff --git a/src/melee/melee-util.h b/src/melee/melee-util.h
index 503feea..a94c51d 100644 (file)
--- a/src/melee/melee-util.h
+++ b/src/melee/melee-util.h
@@ -2,7 +2,7 @@
 
 #include "effect/attribute-types.h"
 #include "monster-attack/monster-attack-effect.h"
-#include "monster-attack/monster-attack-types.h"
+#include "monster-attack/monster-attack-table.h"
 #include "system/angband.h"
 
 /* monster-attack-monster type*/

diff --git a/src/monster-attack/monster-attack-describer.cpp b/src/monster-attack/monster-attack-describer.cpp
index 67dd6f9..eea0c52 100644 (file)
--- a/src/monster-attack/monster-attack-describer.cpp
+++ b/src/monster-attack/monster-attack-describer.cpp
@@ -9,7 +9,7 @@
 #include "main/sound-of-music.h"
 #include "monster-attack/insults-moans.h"
 #include "monster-attack/monster-attack-player.h"
-#include "monster-attack/monster-attack-types.h"
+#include "monster-attack/monster-attack-table.h"
 #include "monster-race/race-indice-types.h"
 #include "system/angband.h"
 #include "system/monster-type-definition.h"

diff --git a/src/monster-attack/monster-attack-player.cpp b/src/monster-attack/monster-attack-player.cpp
index f826160..f094e09 100644 (file)
--- a/src/monster-attack/monster-attack-player.cpp
+++ b/src/monster-attack/monster-attack-player.cpp
@@ -25,7 +25,7 @@
 #include "monster-attack/monster-attack-describer.h"
 #include "monster-attack/monster-attack-effect.h"
 #include "monster-attack/monster-attack-switcher.h"
-#include "monster-attack/monster-attack-types.h"
+#include "monster-attack/monster-attack-table.h"
 #include "monster-race/monster-race.h"
 #include "monster-race/race-flags1.h"
 #include "monster-race/race-flags3.h"

diff --git a/src/monster-attack/monster-attack-switcher.cpp b/src/monster-attack/monster-attack-switcher.cpp
index 41b4524..0a1d5cc 100644 (file)
--- a/src/monster-attack/monster-attack-switcher.cpp
+++ b/src/monster-attack/monster-attack-switcher.cpp
@@ -12,7 +12,7 @@
 #include "monster-attack/monster-attack-lose.h"
 #include "monster-attack/monster-attack-player.h"
 #include "monster-attack/monster-attack-status.h"
-#include "monster-attack/monster-attack-types.h"
+#include "monster-attack/monster-attack-table.h"
 #include "monster-attack/monster-eating.h"
 #include "monster/monster-status.h"
 #include "monster/monster-update.h"

diff --git a/src/monster-attack/monster-attack-types.cpp b/src/monster-attack/monster-attack-table.cpp
similarity index 98%
rename from src/monster-attack/monster-attack-types.cpp
rename to src/monster-attack/monster-attack-table.cpp
index 4835ab3..a26d683 100644 (file)
--- a/src/monster-attack/monster-attack-types.cpp
+++ b/src/monster-attack/monster-attack-table.cpp
@@ -1,4 +1,4 @@
-#include "monster-attack/monster-attack-types.h"
+#include "monster-attack/monster-attack-table.h"
 #include "effect/attribute-types.h"
 #include "monster-attack/monster-attack-effect.h"
 

diff --git a/src/monster-attack/monster-attack-types.h b/src/monster-attack/monster-attack-table.h
similarity index 100%
rename from src/monster-attack/monster-attack-types.h
rename to src/monster-attack/monster-attack-table.h

diff --git a/src/monster-floor/one-monster-placer.cpp b/src/monster-floor/one-monster-placer.cpp
index cffc1bc..998fa3b 100644 (file)
--- a/src/monster-floor/one-monster-placer.cpp
+++ b/src/monster-floor/one-monster-placer.cpp
@@ -18,7 +18,7 @@
 #include "game-option/birth-options.h"
 #include "game-option/cheat-types.h"
 #include "grid/grid.h"
-#include "monster-attack/monster-attack-types.h"
+#include "monster-attack/monster-attack-table.h"
 #include "monster-floor/monster-move.h"
 #include "monster-floor/monster-summon.h"
 #include "monster-floor/place-monster-types.h"

diff --git a/src/monster-race/monster-race-hook.cpp b/src/monster-race/monster-race-hook.cpp
index 9fdac8a..c9084ed 100644 (file)
--- a/src/monster-race/monster-race-hook.cpp
+++ b/src/monster-race/monster-race-hook.cpp
@@ -1,7 +1,7 @@
 #include "monster-race/monster-race-hook.h"
 #include "dungeon/dungeon.h"
 #include "monster-attack/monster-attack-effect.h"
-#include "monster-attack/monster-attack-types.h"
+#include "monster-attack/monster-attack-table.h"
 #include "monster-race/monster-race.h"
 #include "monster-race/race-ability-mask.h"
 #include "monster-race/race-flags-resistance.h"

diff --git a/src/mspell/summon-checker.cpp b/src/mspell/summon-checker.cpp
index d1ee483..6afd382 100644 (file)
--- a/src/mspell/summon-checker.cpp
+++ b/src/mspell/summon-checker.cpp
@@ -1,5 +1,5 @@
 #include "mspell/summon-checker.h"
-#include "monster-attack/monster-attack-types.h"
+#include "monster-attack/monster-attack-table.h"
 #include "monster-race/monster-race-hook.h"
 #include "monster-race/monster-race.h"
 #include "monster-race/race-flags1.h"

diff --git a/src/object/warning.cpp b/src/object/warning.cpp
index 9cd38ab..e68e195 100644 (file)
--- a/src/object/warning.cpp
+++ b/src/object/warning.cpp
@@ -12,7 +12,7 @@
 #include "grid/feature.h"
 #include "inventory/inventory-slot-types.h"
 #include "monster-attack/monster-attack-effect.h"
-#include "monster-attack/monster-attack-types.h"
+#include "monster-attack/monster-attack-table.h"
 #include "monster-race/monster-race.h"
 #include "monster-race/race-ability-flags.h"
 #include "monster-race/race-flags1.h"

diff --git a/src/system/monster-race-definition.h b/src/system/monster-race-definition.h
index 9c96c6d..a72c286 100644 (file)
--- a/src/system/monster-race-definition.h
+++ b/src/system/monster-race-definition.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "monster-attack/monster-attack-effect.h"
-#include "monster-attack/monster-attack-types.h"
+#include "monster-attack/monster-attack-table.h"
 #include "monster-race/monster-aura-types.h"
 #include "monster-race/race-ability-flags.h"
 #include "monster-race/race-behavior-flags.h"

diff --git a/src/view/display-lore-attacks.cpp b/src/view/display-lore-attacks.cpp
index cbf1df2..62b4566 100644 (file)
--- a/src/view/display-lore-attacks.cpp
+++ b/src/view/display-lore-attacks.cpp
@@ -3,7 +3,7 @@
 #include "lore/combat-types-setter.h"
 #include "lore/lore-calculator.h"
 #include "lore/lore-util.h"
-#include "monster-attack/monster-attack-types.h"
+#include "monster-attack/monster-attack-table.h"
 #include "monster-race/race-flags1.h"
 #include "system/monster-race-definition.h"
 #include "term/term-color-types.h"

diff --git a/src/view/display-lore.cpp b/src/view/display-lore.cpp
index 2feda61..8da88c8 100644 (file)
--- a/src/view/display-lore.cpp
+++ b/src/view/display-lore.cpp
@@ -12,7 +12,7 @@
 #include "lore/lore-calculator.h"
 #include "lore/lore-util.h"
 #include "lore/monster-lore.h"
-#include "monster-attack/monster-attack-types.h"
+#include "monster-attack/monster-attack-table.h"
 #include "monster-race/monster-race.h"
 #include "monster-race/race-ability-flags.h"
 #include "monster-race/race-flags1.h"