From 16052d4da336f2d25f49a2d3ff8614043a944e31 Mon Sep 17 00:00:00 2001
From: Hourier <hourier@users.sourceforge.jp>
Date: Thu, 23 Apr 2020 23:09:11 +0900
Subject: [PATCH] [Refactor] #37353 Renamed objectkind-hook.c/h to
 object-kind-hook.c/h

---
 Hengband_vcs2017/Hengband/Hengband.vcxproj           |  4 ++--
 Hengband_vcs2017/Hengband/Hengband.vcxproj.filters   | 12 ++++++------
 src/Makefile.am                                      |  3 ++-
 src/monster1.c                                       |  2 +-
 src/{objectkind-hook.c => object/object-kind-hook.c} |  2 +-
 src/{objectkind-hook.h => object/object-kind-hook.h} |  0
 src/object2.c                                        |  2 +-
 src/patron.c                                         |  2 +-
 src/rooms-special.c                                  |  2 +-
 src/targeting.c                                      |  2 +-
 10 files changed, 16 insertions(+), 15 deletions(-)
 rename src/{objectkind-hook.c => object/object-kind-hook.c} (99%)
 rename src/{objectkind-hook.h => object/object-kind-hook.h} (100%)

diff --git a/Hengband_vcs2017/Hengband/Hengband.vcxproj b/Hengband_vcs2017/Hengband/Hengband.vcxproj
index 8f6c091dc..7d8468f62 100644
--- a/Hengband_vcs2017/Hengband/Hengband.vcxproj
+++ b/Hengband_vcs2017/Hengband/Hengband.vcxproj
@@ -250,7 +250,7 @@
     <ClCompile Include="..\..\src\object-flavor.c" />
     <ClCompile Include="..\..\src\object-hook.c" />
     <ClCompile Include="..\..\src\object\object-kind.c" />
-    <ClCompile Include="..\..\src\objectkind-hook.c" />
+    <ClCompile Include="..\..\src\object\object-kind-hook.c" />
     <ClCompile Include="..\..\src\object-broken.c" />
     <ClCompile Include="..\..\src\patron.c" />
     <ClCompile Include="..\..\src\player-class.c" />
@@ -493,7 +493,7 @@
     <ClInclude Include="..\..\src\object-hook.h" />
     <ClInclude Include="..\..\src\object-broken.h" />
     <ClInclude Include="..\..\src\object.h" />
-    <ClInclude Include="..\..\src\objectkind-hook.h" />
+    <ClInclude Include="..\..\src\object\object-kind-hook.h" />
     <ClInclude Include="..\..\src\object\object-kind.h" />
     <ClInclude Include="..\..\src\patron.h" />
     <ClInclude Include="..\..\src\player-class.h" />
diff --git a/Hengband_vcs2017/Hengband/Hengband.vcxproj.filters b/Hengband_vcs2017/Hengband/Hengband.vcxproj.filters
index 8208fcb1e..70b2964fc 100644
--- a/Hengband_vcs2017/Hengband/Hengband.vcxproj.filters
+++ b/Hengband_vcs2017/Hengband/Hengband.vcxproj.filters
@@ -84,9 +84,6 @@
     <ClCompile Include="..\..\src\object-hook.c">
       <Filter>object</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\objectkind-hook.c">
-      <Filter>object</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\mutation.c">
       <Filter>player</Filter>
     </ClCompile>
@@ -607,6 +604,9 @@
     <ClCompile Include="..\..\src\object\object-kind.c">
       <Filter>object</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\object\object-kind-hook.c">
+      <Filter>object</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\src\gamevalue.h" />
@@ -683,9 +683,6 @@
     <ClInclude Include="..\..\src\object-hook.h">
       <Filter>object</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\objectkind-hook.h">
-      <Filter>object</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\mutation.h">
       <Filter>player</Filter>
     </ClInclude>
@@ -1196,6 +1193,9 @@
     <ClInclude Include="..\..\src\object\object-kind.h">
       <Filter>object</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\object\object-kind-hook.h">
+      <Filter>object</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\src\wall.bmp" />
diff --git a/src/Makefile.am b/src/Makefile.am
index a2479a936..cc865cf6f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -97,7 +97,8 @@ hengband_SOURCES = \
 	object-boost.c object-boost.h \
 	object-curse.c object-curse.h object-broken.c object-broken.h \
 	object-hook.c object-hook.h object1.c object2.c object.h \
-	objectkind.c objectkind.h objectkind-hook.c objectkind-hook.h \
+	object/object-kind.c object/object-kind.h \
+	object/object-kind-hook.c object/object-kind-hook.h \
 	object-flavor.c object-flavor.h object-ego.c object-ego.h \
 	\
 	patron.h patron.c \
diff --git a/src/monster1.c b/src/monster1.c
index 562001b22..cb8d43084 100644
--- a/src/monster1.c
+++ b/src/monster1.c
@@ -20,7 +20,7 @@
 #include "market/building.h"
 #include "cmd-pet.h"
 #include "floor.h"
-#include "objectkind-hook.h"
+#include "object/object-kind-hook.h"
 #include "player-personality.h"
 #include "monster.h"
 #include "monster-spell.h"
diff --git a/src/objectkind-hook.c b/src/object/object-kind-hook.c
similarity index 99%
rename from src/objectkind-hook.c
rename to src/object/object-kind-hook.c
index 59a91ba20..9f41f15da 100644
--- a/src/objectkind-hook.c
+++ b/src/object/object-kind-hook.c
@@ -1,5 +1,5 @@
 #include "angband.h"
-#include "objectkind-hook.h"
+#include "object/object-kind-hook.h"
 #include "object/object-kind.h"
 
 /*!
diff --git a/src/objectkind-hook.h b/src/object/object-kind-hook.h
similarity index 100%
rename from src/objectkind-hook.h
rename to src/object/object-kind-hook.h
diff --git a/src/object2.c b/src/object2.c
index ec4158d7d..93e72ad36 100644
--- a/src/object2.c
+++ b/src/object2.c
@@ -32,7 +32,7 @@
 #include "object-flavor.h"
 #include "object-hook.h"
 #include "object-curse.h"
-#include "objectkind-hook.h"
+#include "object/object-kind-hook.h"
 #include "artifact.h"
 #include "feature.h"
 #include "player-status.h"
diff --git a/src/patron.c b/src/patron.c
index df3635c39..6330ebbbd 100644
--- a/src/patron.c
+++ b/src/patron.c
@@ -9,7 +9,7 @@
 #include "object-curse.h"
 #include "object-flavor.h"
 #include "monsterrace-hook.h"
-#include "objectkind-hook.h"
+#include "object/object-kind-hook.h"
 #include "mutation.h"
 #include "artifact.h"
 #include "player-status.h"
diff --git a/src/rooms-special.c b/src/rooms-special.c
index 77966f2ae..6e66618b6 100644
--- a/src/rooms-special.c
+++ b/src/rooms-special.c
@@ -6,7 +6,7 @@
 #include "rooms.h"
 #include "monster.h"
 #include "monsterrace-hook.h"
-#include "objectkind-hook.h"
+#include "object/object-kind-hook.h"
 #include "feature.h"
 #include "floor.h"
 #include "dungeon.h"
diff --git a/src/targeting.c b/src/targeting.c
index 3b3e8a58d..fcb3ee33b 100644
--- a/src/targeting.c
+++ b/src/targeting.c
@@ -23,7 +23,7 @@
 #include "object-flavor.h"
 #include "monster.h"
 #include "monsterrace-hook.h"
-#include "objectkind-hook.h"
+#include "object/object-kind-hook.h"
 #include "sort.h"
 #include "spells-summon.h"
 #include "grid.h"
-- 
2.11.0