[Refactor] #40413 Moved sort.c/h from core/ to util/

diff --git a/Hengband/Hengband/Hengband.vcxproj b/Hengband/Hengband/Hengband.vcxproj
index 746b89c..576ef63 100644 (file)
--- a/Hengband/Hengband/Hengband.vcxproj
+++ b/Hengband/Hengband/Hengband.vcxproj
@@ -890,7 +890,7 @@
     <ClCompile Include="..\..\src\player\selfinfo.c" />\r
     <ClCompile Include="..\..\src\io\signal-handlers.c" />\r
     <ClCompile Include="..\..\src\mind\mind-sniper.c" />\r
-    <ClCompile Include="..\..\src\core\sort.c" />\r
+    <ClCompile Include="..\..\src\util\sort.c" />\r
     <ClCompile Include="..\..\src\spell\spells-diceroll.c" />\r
     <ClCompile Include="..\..\src\spell-kind\spells-floor.c" />\r
     <ClCompile Include="..\..\src\spell\spells-object.c" />\r
@@ -1139,7 +1139,7 @@
     <ClInclude Include="..\..\src\core\scores.h" />\r
     <ClInclude Include="..\..\src\player\selfinfo.h" />\r
     <ClInclude Include="..\..\src\mind\mind-sniper.h" />\r
-    <ClInclude Include="..\..\src\core\sort.h" />\r
+    <ClInclude Include="..\..\src\util\sort.h" />\r
     <ClInclude Include="..\..\src\spell\spells-diceroll.h" />\r
     <ClInclude Include="..\..\src\spell-kind\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 f09ac75..c095b8f 100644 (file)
--- a/Hengband/Hengband/Hengband.vcxproj.filters
+++ b/Hengband/Hengband/Hengband.vcxproj.filters
@@ -587,9 +587,6 @@
     <ClCompile Include="..\..\src\core\scores.c">
       <Filter>core</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\core\sort.c">
-      <Filter>core</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\mspell\mspell-bolt.c">
       <Filter>mspell</Filter>
     </ClCompile>
@@ -1382,6 +1379,9 @@
     <ClCompile Include="..\..\src\term\screen-processor.c">
       <Filter>term</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\util\sort.c">
+      <Filter>util</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\src\cmd\cmd-basic.h">
@@ -2017,9 +2017,6 @@
     <ClInclude Include="..\..\src\core\scores.h">
       <Filter>core</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\core\sort.h">
-      <Filter>core</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\mspell\monster-spell.h">
       <Filter>mspell</Filter>
     </ClInclude>
@@ -3025,6 +3022,9 @@
     <ClInclude Include="..\..\src\term\screen-processor.h">
       <Filter>term</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\util\sort.h">
+      <Filter>util</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\src\wall.bmp" />

diff --git a/src/Makefile.am b/src/Makefile.am
index c0bfcd5..f7a632e 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -114,7 +114,6 @@ hengband_SOURCES = \
        core/player-processor.c core/player-processor.h \
        core/scores.c core/scores.h \
        core/show-file.c core/show-file.h \
-       core/sort.c core/sort.h \
        core/special-internal-keys.h \
        core/speed-table.c core/speed-table.h \
        core/stuff-handler.c core/stuff-handler.h \
@@ -550,6 +549,7 @@ hengband_SOURCES = \
        util/angband-files.c util/angband-files.h \
        util/object-sort.c util/object-sort.h \
        util/quarks.c util/quarks.h \
+       util/sort.c util/sort.h \
        util/string-processor.c util/string-processor.h \
        util/util.c util/util.h \
        \

diff --git a/src/cmd-action/cmd-pet.c b/src/cmd-action/cmd-pet.c
index 5701a0d..2e6643a 100644 (file)
--- a/src/cmd-action/cmd-pet.c
+++ b/src/cmd-action/cmd-pet.c
@@ -3,7 +3,7 @@
 #include "cmd-io/cmd-dump.h"
 #include "cmd/cmd-basic.h"
 #include "core/asking-player.h"
-#include "core/sort.h"
+#include "util/sort.h"
 #include "core/stuff-handler.h"
 #include "effect/spells-effect-util.h"
 #include "floor/floor.h"

diff --git a/src/cmd-io/cmd-lore.c b/src/cmd-io/cmd-lore.c
index fb3e0de..a9d223e 100644 (file)
--- a/src/cmd-io/cmd-lore.c
+++ b/src/cmd-io/cmd-lore.c
@@ -1,6 +1,6 @@
 #include "cmd-io/cmd-lore.h"
 #include "core/asking-player.h"
-#include "core/sort.h"
+#include "util/sort.h"
 #include "core/stuff-handler.h"
 #include "game-option/game-play-options.h"
 #include "game-option/cheat-options.h"

diff --git a/src/cmd-item/cmd-activate.c b/src/cmd-item/cmd-activate.c
index 8b5beda..b6e9eb2 100644 (file)
--- a/src/cmd-item/cmd-activate.c
+++ b/src/cmd-item/cmd-activate.c
@@ -12,7 +12,7 @@
 #include "cmd-io/cmd-save.h"
 #include "cmd/cmd-basic.h"
 #include "core/asking-player.h"
-#include "core/sort.h"
+#include "util/sort.h"
 #include "effect/effect-characteristics.h"
 #include "effect/spells-effect-util.h"
 #include "floor/floor.h"

diff --git a/src/io-dump/character-dump.c b/src/io-dump/character-dump.c
index 1efd576..d934be1 100644 (file)
--- a/src/io-dump/character-dump.c
+++ b/src/io-dump/character-dump.c
@@ -1,6 +1,6 @@
 #include "io-dump/character-dump.h"
 #include "art-definition/art-bow-types.h"
-#include "core/sort.h"
+#include "util/sort.h"
 #include "dungeon/dungeon.h"
 #include "dungeon/quest.h"
 #include "floor/floor-town.h"

diff --git a/src/io/save.c b/src/io/save.c
index f4a9209..5db6915 100644 (file)
--- a/src/io/save.c
+++ b/src/io/save.c
@@ -14,7 +14,7 @@
 #include "io/save.h"
 #include "birth/quick-start.h"
 #include "cmd-building/cmd-building.h"
-#include "core/sort.h"
+#include "util/sort.h"
 #include "dungeon/dungeon.h"
 #include "dungeon/quest.h"
 #include "floor/floor-events.h"

diff --git a/src/io/targeting.c b/src/io/targeting.c
index e2acb89..53d5c32 100644 (file)
--- a/src/io/targeting.c
+++ b/src/io/targeting.c
@@ -13,7 +13,7 @@
 #include "cmd-action/cmd-pet.h"
 #include "cmd-building/cmd-building.h"
 #include "core/asking-player.h"
-#include "core/sort.h"
+#include "util/sort.h"
 #include "core/stuff-handler.h"
 #include "info-reader/fixed-map-parser.h"
 #include "dungeon/dungeon.h"

diff --git a/src/knowledge/knowledge-items.c b/src/knowledge/knowledge-items.c
index abd40d0..77b9742 100644 (file)
--- a/src/knowledge/knowledge-items.c
+++ b/src/knowledge/knowledge-items.c
@@ -6,7 +6,7 @@
 
 #include "knowledge/knowledge-items.h"
 #include "core/show-file.h"
-#include "core/sort.h"
+#include "util/sort.h"
 #include "core/stuff-handler.h"
 #include "floor/floor.h"
 #include "game-option/special-options.h"

diff --git a/src/knowledge/knowledge-monsters.c b/src/knowledge/knowledge-monsters.c
index 26e5ea6..a0aec41 100644 (file)
--- a/src/knowledge/knowledge-monsters.c
+++ b/src/knowledge/knowledge-monsters.c
@@ -7,7 +7,7 @@
 
 #include "knowledge/knowledge-monsters.h"
 #include "core/show-file.h"
-#include "core/sort.h"
+#include "util/sort.h"
 #include "core/stuff-handler.h"
 #include "floor/floor.h"
 #include "game-option/cheat-options.h"

diff --git a/src/knowledge/knowledge-quests.c b/src/knowledge/knowledge-quests.c
index 3e85fb2..174b032 100644 (file)
--- a/src/knowledge/knowledge-quests.c
+++ b/src/knowledge/knowledge-quests.c
@@ -6,7 +6,7 @@
 
 #include "knowledge-quests.h"
 #include "core/show-file.h"
-#include "core/sort.h"
+#include "util/sort.h"
 #include "dungeon/dungeon.h"
 #include "dungeon/quest.h"
 #include "floor/floor.h"

diff --git a/src/knowledge/knowledge-uniques.c b/src/knowledge/knowledge-uniques.c
index efe4f15..6ca4de0 100644 (file)
--- a/src/knowledge/knowledge-uniques.c
+++ b/src/knowledge/knowledge-uniques.c
@@ -8,7 +8,7 @@
 #include "game-option/cheat-options.h"
 #include "knowledge-items.h"
 #include "io-dump/dump-util.h"
-#include "core/sort.h"
+#include "util/sort.h"
 #include "core/show-file.h"
 #include "monster-race/race-flags1.h"
 #include "util/angband-files.h"

diff --git a/src/market/building-monster.c b/src/market/building-monster.c
index 4f6d5e6..1cced8a 100644 (file)
--- a/src/market/building-monster.c
+++ b/src/market/building-monster.c
@@ -1,6 +1,6 @@
 #include "market/building-monster.h"
 #include "core/asking-player.h"
-#include "core/sort.h"
+#include "util/sort.h"
 #include "core/stuff-handler.h"
 #include "game-option/game-play-options.h"
 #include "io/input-key-acceptor.h"

diff --git a/src/room/rooms-pit-nest.c b/src/room/rooms-pit-nest.c
index 82a09d0..1775d48 100644 (file)
--- a/src/room/rooms-pit-nest.c
+++ b/src/room/rooms-pit-nest.c
@@ -1,5 +1,5 @@
 #include "room/rooms-pit-nest.h"
-#include "core/sort.h"
+#include "util/sort.h"
 #include "dungeon/dungeon.h"
 #include "floor/floor-generate.h"
 #include "floor/floor.h"

diff --git a/src/core/sort.c b/src/util/sort.c
similarity index 99%
rename from src/core/sort.c
rename to src/util/sort.c
index 79c5768..5649421 100644 (file)
--- a/src/core/sort.c
+++ b/src/util/sort.c
@@ -1,4 +1,4 @@
-#include "core/sort.h"
+#include "util/sort.h"
 #include "floor/floor.h"
 #include "dungeon/quest.h"
 #include "object-enchant/artifact.h"

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

diff --git a/src/wizard/wizard-spoiler.c b/src/wizard/wizard-spoiler.c
index c790667..e9041f2 100644 (file)
--- a/src/wizard/wizard-spoiler.c
+++ b/src/wizard/wizard-spoiler.c
@@ -11,7 +11,7 @@
  */
 
 #include "wizard/wizard-spoiler.h"
-#include "core/sort.h"
+#include "util/sort.h"
 #include "floor/floor-town.h"
 #include "io/files-util.h"
 #include "io/input-key-acceptor.h"