[Refactor] #38862 Moved sort.c/h to core/

diff --git a/Hengband/Hengband/Hengband.vcxproj b/Hengband/Hengband/Hengband.vcxproj
index 9723c2e..b524882 100644 (file)
--- a/Hengband/Hengband/Hengband.vcxproj
+++ b/Hengband/Hengband/Hengband.vcxproj
@@ -484,7 +484,7 @@
     <ClCompile Include="..\..\src\player\selfinfo.c" />\r
     <ClCompile Include="..\..\src\io\signal-handlers.c" />\r
     <ClCompile Include="..\..\src\combat\snipe.c" />\r
-    <ClCompile Include="..\..\src\sort.c" />\r
+    <ClCompile Include="..\..\src\core\sort.c" />\r
     <ClCompile Include="..\..\src\spell\spells-diceroll.c" />\r
     <ClCompile Include="..\..\src\spell\spells-floor.c" />\r
     <ClCompile Include="..\..\src\spell\spells-object.c" />\r
@@ -705,7 +705,7 @@
     <ClInclude Include="..\..\src\core\scores.h" />\r
     <ClInclude Include="..\..\src\player\selfinfo.h" />\r
     <ClInclude Include="..\..\src\combat\snipe.h" />\r
-    <ClInclude Include="..\..\src\sort.h" />\r
+    <ClInclude Include="..\..\src\core\sort.h" />\r
     <ClInclude Include="..\..\src\spell\spells-diceroll.h" />\r
     <ClInclude Include="..\..\src\spell\spells-floor.h" />\r
     <ClInclude Include="..\..\src\spell\spells-object.h" />\r

diff --git a/Hengband/Hengband/Hengband.vcxproj.filters b/Hengband/Hengband/Hengband.vcxproj.filters
index 7a3f2d7..198078c 100644 (file)
--- a/Hengband/Hengband/Hengband.vcxproj.filters
+++ b/Hengband/Hengband/Hengband.vcxproj.filters
@@ -5,9 +5,6 @@
     <ClCompile Include="..\..\src\util.c">
       <Filter>core</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\sort.c">
-      <Filter>core</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\cmd\cmd-activate.c">
       <Filter>cmd</Filter>
     </ClCompile>
@@ -839,14 +836,14 @@
     <ClCompile Include="..\..\src\core\scores.c">
       <Filter>core</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\core\sort.c">
+      <Filter>core</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\src\util.h">
       <Filter>core</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\sort.h">
-      <Filter>core</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\cmd\cmd-activate.h">
       <Filter>cmd</Filter>
     </ClInclude>
@@ -1723,6 +1720,9 @@
     <ClInclude Include="..\..\src\core\scores.h">
       <Filter>core</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\core\sort.h">
+      <Filter>core</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\src\wall.bmp" />

diff --git a/src/Makefile.am b/src/Makefile.am
index 78c4ae1..99fbd26 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -105,7 +105,7 @@ hengband_SOURCES = \
        core/magic-effects-timeout-reducer.c core/magic-effects-timeout-reducer.h \
        core/player-processor.c core/player-processor.h \
        core/scores.c core/scores.h \
-       \
+       core/sort.c core/sort.h \
        dungeon/dungeon.c dungeon/dungeon.h \
        dungeon/dungeon-processor.c dungeon/dungeon-processor.h \
        dungeon/dungeon-file.c dungeon/dungeon-file.h \
@@ -246,7 +246,7 @@ hengband_SOURCES = \
        spell/spells-summon.c spell/spells-summon.h \
        spell/spells-world.c spell/spells-world.h \
        \
-       sort.c sort.h util.c util.h \
+       util.c util.h \
        \
        view-mainwindow.c view-mainwindow.h targeting.c targeting.h \
        \

diff --git a/src/cmd/cmd-activate.c b/src/cmd/cmd-activate.c
index f44b9f9..ce492f8 100644 (file)
--- a/src/cmd/cmd-activate.c
+++ b/src/cmd/cmd-activate.c
@@ -13,7 +13,7 @@
 #include "cmd/cmd-basic.h"
 #include "cmd/cmd-save.h"
 #include "object/object-hook.h"
-#include "sort.h"
+#include "core/sort.h"
 #include "object/artifact.h"
 #include "player/avatar.h"
 #include "spell/spells-summon.h"

diff --git a/src/cmd/cmd-item.c b/src/cmd/cmd-item.c
index 284ca4a..69fc3c4 100644 (file)
--- a/src/cmd/cmd-item.c
+++ b/src/cmd/cmd-item.c
@@ -30,7 +30,7 @@
 #include "object/object-flavor.h"
 #include "object/object-hook.h"
 #include "object/object-ego.h"
-#include "sort.h"
+#include "core/sort.h"
 #include "dungeon/quest.h"
 #include "object/artifact.h"
 #include "player/avatar.h"

diff --git a/src/cmd/cmd-pet.c b/src/cmd/cmd-pet.c
index 654390d..de16a4e 100644 (file)
--- a/src/cmd/cmd-pet.c
+++ b/src/cmd/cmd-pet.c
@@ -7,7 +7,7 @@
 #include "floor/floor.h"
 #include "grid/grid.h"
 #include "melee.h"
-#include "sort.h"
+#include "core/sort.h"
 #include "player/player-move.h"
 #include "player/player-status.h"
 #include "player/player-effects.h"

diff --git a/src/sort.c b/src/core/sort.c
similarity index 99%
rename from src/sort.c
rename to src/core/sort.c
index f985885..1a43427 100644 (file)
--- a/src/sort.c
+++ b/src/core/sort.c
@@ -1,5 +1,5 @@
 #include "system/angband.h"
-#include "sort.h"
+#include "core/sort.h"
 #include "floor/floor.h"
 #include "dungeon/quest.h"
 #include "object/artifact.h"

diff --git a/src/sort.h b/src/core/sort.h
similarity index 100%
rename from src/sort.h
rename to src/core/sort.h

diff --git a/src/io/character-dump.c b/src/io/character-dump.c
index 64d0fb0..fe10562 100644 (file)
--- a/src/io/character-dump.c
+++ b/src/io/character-dump.c
@@ -6,7 +6,7 @@
 #include "market/store.h"
 #include "cmd/cmd-pet.h"
 #include "monster/monster-status.h"
-#include "sort.h"
+#include "core/sort.h"
 #include "dungeon/quest.h"
 #include "main/init.h"
 #include "io/mutations-dump.h"

diff --git a/src/io/save.c b/src/io/save.c
index 6e2ea3f..b2300d5 100644 (file)
--- a/src/io/save.c
+++ b/src/io/save.c
@@ -19,7 +19,7 @@
 
 #include "system/angband-version.h"
 #include "object/artifact.h"
-#include "sort.h"
+#include "core/sort.h"
 #include "dungeon/dungeon.h"
 #include "dungeon/quest.h"
 #include "market/store.h"

diff --git a/src/io/targeting.c b/src/io/targeting.c
index 1d6f179..58dc531 100644 (file)
--- a/src/io/targeting.c
+++ b/src/io/targeting.c
@@ -25,7 +25,7 @@
 #include "monster/monster.h"
 #include "monster/monsterrace-hook.h"
 #include "object/object-kind-hook.h"
-#include "sort.h"
+#include "core/sort.h"
 #include "spell/spells-summon.h"
 #include "grid/grid.h"
 #include "floor/floor.h"

diff --git a/src/knowledge/knowledge-items.c b/src/knowledge/knowledge-items.c
index b9bd7cc..6d9a781 100644 (file)
--- a/src/knowledge/knowledge-items.c
+++ b/src/knowledge/knowledge-items.c
@@ -8,7 +8,7 @@
 #include "knowledge-items.h"
 #include "cmd/dump-util.h"
 #include "object/artifact.h"
-#include "sort.h"
+#include "core/sort.h"
 #include "object/object-flavor.h"
 #include "object/object-hook.h"
 #include "object/object-kind.h"

diff --git a/src/knowledge/knowledge-monsters.c b/src/knowledge/knowledge-monsters.c
index 6bc489a..2174323 100644 (file)
--- a/src/knowledge/knowledge-monsters.c
+++ b/src/knowledge/knowledge-monsters.c
@@ -8,7 +8,7 @@
 #include "system/angband.h"
 #include "knowledge/knowledge-monsters.h"
 #include "cmd/dump-util.h"
-#include "sort.h"
+#include "core/sort.h"
 #include "cmd/monster-group-table.h"
 #include "monster/monster-status.h"
 #include "world/world.h"

diff --git a/src/knowledge/knowledge-quests.c b/src/knowledge/knowledge-quests.c
index b11b724..207ba66 100644 (file)
--- a/src/knowledge/knowledge-quests.c
+++ b/src/knowledge/knowledge-quests.c
@@ -13,7 +13,7 @@
 #include "object/object-flavor.h"
 #include "dungeon/dungeon.h"
 #include "dungeon/dungeon-file.h"
-#include "sort.h"
+#include "core/sort.h"
 #include "world/world.h"
 #include "core/show-file.h"
 #include "locale/english.h"

diff --git a/src/knowledge/knowledge-uniques.c b/src/knowledge/knowledge-uniques.c
index 0e6bdd3..91bd5b5 100644 (file)
--- a/src/knowledge/knowledge-uniques.c
+++ b/src/knowledge/knowledge-uniques.c
@@ -7,7 +7,7 @@
 #include "system/angband.h"
 #include "knowledge-items.h"
 #include "cmd/dump-util.h"
-#include "sort.h"
+#include "core/sort.h"
 #include "core/show-file.h"
 
 /*

diff --git a/src/market/building.c b/src/market/building.c
index 02e229b..d50355d 100644 (file)
--- a/src/market/building.c
+++ b/src/market/building.c
@@ -36,7 +36,7 @@
 #include "melee.h"
 #include "floor/wild.h"
 #include "world/world.h"
-#include "sort.h"
+#include "core/sort.h"
 
 #include "player/avatar.h"
 #include "market/building.h"

diff --git a/src/room/rooms-pit-nest.c b/src/room/rooms-pit-nest.c
index 7fc0b35..6175ef5 100644 (file)
--- a/src/room/rooms-pit-nest.c
+++ b/src/room/rooms-pit-nest.c
@@ -7,7 +7,7 @@
 #include "room/rooms-pit-nest.h"
 #include "monster/monster.h"
 #include "monster/monsterrace-hook.h"
-#include "sort.h"
+#include "core/sort.h"
 #include "floor/floor.h"
 #include "grid/feature.h"
 #include "dungeon/dungeon.h"

diff --git a/src/wizard/wizard-spoiler.c b/src/wizard/wizard-spoiler.c
index 39ac6f1..e9a5241 100644 (file)
--- a/src/wizard/wizard-spoiler.c
+++ b/src/wizard/wizard-spoiler.c
@@ -17,7 +17,7 @@
 
 #include "system/angband-version.h"
 #include "object/artifact.h"
-#include "sort.h"
+#include "core/sort.h"
 #include "market/store.h"
 #include "market/store-util.h"
 #include "monster/monster.h"