[Refactor] #40014 Renamed display-monster-lore.c/h to display-lore.c/h

diff --git a/Hengband/Hengband/Hengband.vcxproj b/Hengband/Hengband/Hengband.vcxproj
index b53fe71..f7b70e3 100644 (file)
--- a/Hengband/Hengband/Hengband.vcxproj
+++ b/Hengband/Hengband/Hengband.vcxproj
@@ -852,7 +852,7 @@
     <ClCompile Include="..\..\src\view\display-birth.c" />\r
     <ClCompile Include="..\..\src\view\display-characteristic.c" />\r
     <ClCompile Include="..\..\src\view\display-fruit.c" />\r
-    <ClCompile Include="..\..\src\view\display-monster-lore.c" />\r
+    <ClCompile Include="..\..\src\view\display-lore.c" />\r
     <ClCompile Include="..\..\src\view\display-monster-status.c" />\r
     <ClCompile Include="..\..\src\view\display-player-middle.c" />\r
     <ClCompile Include="..\..\src\view\display-player-stat-info.c" />\r
@@ -918,7 +918,7 @@
     <ClInclude Include="..\..\src\term\term-color-types.h" />\r
     <ClInclude Include="..\..\src\util\object-sort.h" />\r
     <ClInclude Include="..\..\src\view\display-birth.h" />\r
-    <ClInclude Include="..\..\src\view\display-monster-lore.h" />\r
+    <ClInclude Include="..\..\src\view\display-lore.h" />\r
     <ClInclude Include="..\..\src\view\display-monster-status.h" />\r
     <ClInclude Include="..\..\src\view\object-describer.h" />\r
     <ClInclude Include="..\..\src\world\world-object.h" />\r

diff --git a/Hengband/Hengband/Hengband.vcxproj.filters b/Hengband/Hengband/Hengband.vcxproj.filters
index 2e49422..d839d3a 100644 (file)
--- a/Hengband/Hengband/Hengband.vcxproj.filters
+++ b/Hengband/Hengband/Hengband.vcxproj.filters
@@ -1247,9 +1247,6 @@
     <ClCompile Include="..\..\src\mspell\summon-checker.c">
       <Filter>mspell</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\view\display-monster-lore.c">
-      <Filter>view</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\cmd-io\cmd-lore.c">
       <Filter>cmd-io</Filter>
     </ClCompile>
@@ -1286,6 +1283,9 @@
     <ClCompile Include="..\..\src\lore\lore-util.c">
       <Filter>lore</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\view\display-lore.c">
+      <Filter>view</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\src\cmd\cmd-basic.h">
@@ -2785,9 +2785,6 @@
     <ClInclude Include="..\..\src\mspell\summon-checker.h">
       <Filter>mspell</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\view\display-monster-lore.h">
-      <Filter>view</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\cmd-io\cmd-lore.h">
       <Filter>cmd-io</Filter>
     </ClInclude>
@@ -2824,6 +2821,9 @@
     <ClInclude Include="..\..\src\lore\lore-util.h">
       <Filter>lore</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\view\display-lore.h">
+      <Filter>view</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\src\wall.bmp" />

diff --git a/src/Makefile.am b/src/Makefile.am
index 6db5364..27e9dfa 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -522,8 +522,8 @@ hengband_SOURCES = \
        \
        view/display-characteristic.c view/display-characteristic.h \
        view/display-fruit.c view/display-fruit.h \
+       view/display-lore.c view/display-lore.h \
        view/display-main-window.c view/display-main-window.h \
-       view/display-monster-lore.c view/display-monster-lore.h \
        view/display-monster-status.c view/display-monster-status.h \
        view/display-player-stat-info.c view/display-player-stat-info.h \
        view/display-player-misc-info.c view/display-player-misc-info.h \

diff --git a/src/cmd-io/cmd-lore.c b/src/cmd-io/cmd-lore.c
index 6b2a692..ce10f06 100644 (file)
--- a/src/cmd-io/cmd-lore.c
+++ b/src/cmd-io/cmd-lore.c
@@ -6,7 +6,7 @@
 #include "term/gameterm.h"
 #include "term/term-color-types.h"
 #include "view/display-main-window.h"
-#include "view/display-monster-lore.h"
+#include "view/display-lore.h"
 
 /*!
  * @brief モンスターの思い出を見るコマンドのメインルーチン

diff --git a/src/io/targeting.c b/src/io/targeting.c
index a7ed183..c995cd9 100644 (file)
--- a/src/io/targeting.c
+++ b/src/io/targeting.c
@@ -45,7 +45,7 @@
 #include "system/system-variables.h"
 #include "term/term-color-types.h"
 #include "view/display-main-window.h"
-#include "view/display-monster-lore.h"
+#include "view/display-lore.h"
 #include "view/display-monster-status.h"
 #include "world/world.h"
 

diff --git a/src/knowledge/knowledge-monsters.c b/src/knowledge/knowledge-monsters.c
index 0512ef5..0896efc 100644 (file)
--- a/src/knowledge/knowledge-monsters.c
+++ b/src/knowledge/knowledge-monsters.c
@@ -23,7 +23,7 @@
 #include "monster/smart-learn-types.h"
 #include "term/term-color-types.h"
 #include "view/display-main-window.h" // 暫定、後で消す.
-#include "view/display-monster-lore.h"
+#include "view/display-lore.h"
 #include "view/display-monster-status.h"
 #include "world/world.h"
 

diff --git a/src/lore/monster-lore.c b/src/lore/monster-lore.c
index 0d8622b..4993067 100644 (file)
--- a/src/lore/monster-lore.c
+++ b/src/lore/monster-lore.c
@@ -22,7 +22,7 @@
 #include "mspell/mspell-type.h"
 #include "term/term-color-types.h"
 #include "util/util.h"
-#include "view/display-monster-lore.h"
+#include "view/display-lore.h"
 
 /*!
  * 英語の複数系記述用マクロ / Pluralizer.  Args(count, singular, plural)

diff --git a/src/market/building-monster.c b/src/market/building-monster.c
index 20c71a6..4e4a188 100644 (file)
--- a/src/market/building-monster.c
+++ b/src/market/building-monster.c
@@ -6,7 +6,7 @@
 #include "term/gameterm.h"
 #include "term/term-color-types.h"
 #include "view/display-main-window.h"
-#include "view/display-monster-lore.h"
+#include "view/display-lore.h"
 
 /*!
  * @brief 施設でモンスターの情報を知るメインルーチン / research_mon -KMW-

diff --git a/src/view/display-monster-lore.c b/src/view/display-lore.c
similarity index 99%
rename from src/view/display-monster-lore.c
rename to src/view/display-lore.c
index 4065094..6509539 100644 (file)
--- a/src/view/display-monster-lore.c
+++ b/src/view/display-lore.c
@@ -4,7 +4,7 @@
  * @author Hourier
  */
 
-#include "view/display-monster-lore.h"
+#include "view/display-lore.h"
 #include "lore/monster-lore.h"
 #include "monster-race/race-flags1.h"
 #include "monster-race/race-flags2.h"

diff --git a/src/view/display-monster-lore.h b/src/view/display-lore.h
similarity index 100%
rename from src/view/display-monster-lore.h
rename to src/view/display-lore.h

diff --git a/src/view/display-main-window.c b/src/view/display-main-window.c
index 42c4a81..ed7d15d 100644 (file)
--- a/src/view/display-main-window.c
+++ b/src/view/display-main-window.c
@@ -54,7 +54,7 @@
 #include "term/gameterm.h"
 #include "term/term-color-types.h"
 #include "util/util.h"
-#include "view/display-monster-lore.h"
+#include "view/display-lore.h"
 #include "view/display-player.h"
 #include "view/object-describer.h"
 #include "world/world.h"

diff --git a/src/wizard/wizard-spoiler.c b/src/wizard/wizard-spoiler.c
index d45dbd7..543bceb 100644 (file)
--- a/src/wizard/wizard-spoiler.c
+++ b/src/wizard/wizard-spoiler.c
@@ -35,7 +35,7 @@
 #include "system/angband-version.h"
 #include "term/term-color-types.h"
 #include "util/util.h"
-#include "view/display-monster-lore.h"
+#include "view/display-lore.h"
 
  /*
   * The spoiler file being created