[Refactor] #38662 Moved util.* to util/

diff --git a/Hengband/Hengband/Hengband.vcxproj b/Hengband/Hengband/Hengband.vcxproj
index b524882..ad77d1a 100644 (file)
--- a/Hengband/Hengband/Hengband.vcxproj
+++ b/Hengband/Hengband/Hengband.vcxproj
@@ -509,7 +509,7 @@
     <ClCompile Include="..\..\src\io\targeting.c" />\r
     <ClCompile Include="..\..\src\term\gameterm.c" />\r
     <ClCompile Include="..\..\src\grid\trap.c" />\r
-    <ClCompile Include="..\..\src\util.c" />\r
+    <ClCompile Include="..\..\src\util\util.c" />\r
     <ClCompile Include="..\..\src\view\display-main-window.c" />\r
     <ClCompile Include="..\..\src\object\warning.c" />\r
     <ClCompile Include="..\..\src\floor\wild.c" />\r
@@ -718,7 +718,7 @@
     <ClInclude Include="..\..\src\io\targeting.h" />\r
     <ClInclude Include="..\..\src\term\gameterm.h" />\r
     <ClInclude Include="..\..\src\grid\trap.h" />\r
-    <ClInclude Include="..\..\src\util.h" />\r
+    <ClInclude Include="..\..\src\util\util.h" />\r
     <ClInclude Include="..\..\src\view\display-main-window.h" />\r
     <ClInclude Include="..\..\src\object\warning.h" />\r
     <ClInclude Include="..\..\src\floor\wild.h" />\r

diff --git a/Hengband/Hengband/Hengband.vcxproj.filters b/Hengband/Hengband/Hengband.vcxproj.filters
index 198078c..29515d2 100644 (file)
--- a/Hengband/Hengband/Hengband.vcxproj.filters
+++ b/Hengband/Hengband/Hengband.vcxproj.filters
@@ -2,9 +2,6 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <ClCompile Include="..\..\src\main-win.c" />
-    <ClCompile Include="..\..\src\util.c">
-      <Filter>core</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\cmd\cmd-activate.c">
       <Filter>cmd</Filter>
     </ClCompile>
@@ -839,11 +836,11 @@
     <ClCompile Include="..\..\src\core\sort.c">
       <Filter>core</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\util\util.c">
+      <Filter>core</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\src\util.h">
-      <Filter>core</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\cmd\cmd-activate.h">
       <Filter>cmd</Filter>
     </ClInclude>
@@ -1723,6 +1720,9 @@
     <ClInclude Include="..\..\src\core\sort.h">
       <Filter>core</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\util\util.h">
+      <Filter>core</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\src\wall.bmp" />

diff --git a/src/Makefile.am b/src/Makefile.am
index 99fbd26..1423daf 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -246,8 +246,6 @@ hengband_SOURCES = \
        spell/spells-summon.c spell/spells-summon.h \
        spell/spells-world.c spell/spells-world.h \
        \
-       util.c util.h \
-       \
        view-mainwindow.c view-mainwindow.h targeting.c targeting.h \
        \
        knowledge/knowledge-autopick.c knowledge/knowledge-autopick.h \
@@ -290,6 +288,7 @@ hengband_SOURCES = \
        term/z-term.c term/z-term.h term/z-util.c term/z-util.h \
        term/z-virt.c term/z-virt.h \
        \
+       util/util.c util/util.h \
        \
        wizard/wizard-spoiler.c wizard/wizard-spoiler.h\
        wizard/wizard-special-process.c wizard/wizard-special-process.h \
@@ -311,8 +310,8 @@ COMPILE = $(srcdir)/gcc-wrap $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
        $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) \
        -Iautopick -Ibirth -Icmd -Icombat -Icore -Idungeon -Ieffect -Ifloor \
        -Igrid -Iinventory -Iio -Iknowledge -Imarket -Imind -Imonster -Imutation \
-       -Iobject -Iplayer -Irealm -Iroom -Ispell -Isystem -Iterm -Iview -Iwizard \
-       -Iworld
+       -Iobject -Iplayer -Irealm -Iroom -Ispell -Isystem -Iterm -Iutil -Iview \
+       -Iwizard -Iworld
 
 install-exec-hook:
 if SET_GID

diff --git a/src/autopick/autopick-registry.c b/src/autopick/autopick-registry.c
index 1d842c9..2548ac9 100644 (file)
--- a/src/autopick/autopick-registry.c
+++ b/src/autopick/autopick-registry.c
@@ -14,7 +14,7 @@
 #include "object/object-hook.h"
 #include "object/object-kind.h"
 #include "object/object-flavor.h"
-#include "util.h"
+#include "util/util.h"
 #include "io/files.h"
 
 static const char autoregister_header[] = "?:$AUTOREGISTER";

diff --git a/src/autopick/autopick.c b/src/autopick/autopick.c
index 15df457..3a9a673 100644 (file)
--- a/src/autopick/autopick.c
+++ b/src/autopick/autopick.c
@@ -12,7 +12,7 @@
  */
 
 #include "system/angband.h"
-#include "util.h"
+#include "util/util.h"
 #include "autopick/autopick-menu-data-table.h"
 #include "autopick/autopick-methods-table.h"
 #include "autopick/autopick-destroyer.h"

diff --git a/src/birth/birth.c b/src/birth/birth.c
index bba7193..e76d374 100644 (file)
--- a/src/birth/birth.c
+++ b/src/birth/birth.c
@@ -19,7 +19,7 @@
 #include "main/music-definitions-table.h"
 #include "main/sound-definitions-table.h"
 #include "market/building.h"
-#include "util.h"
+#include "util/util.h"
 
 #include "object/artifact.h"
 #include "autopick/autopick.h"

diff --git a/src/cmd/cmd-eat.c b/src/cmd/cmd-eat.c
index b98827c..36a9892 100644 (file)
--- a/src/cmd/cmd-eat.c
+++ b/src/cmd/cmd-eat.c
@@ -9,7 +9,7 @@
 
 #include "system/angband.h"
 #include "main/sound-definitions-table.h"
-#include "util.h"
+#include "util/util.h"
 
 #include "object/object-flavor.h"
 #include "object/object-hook.h"

diff --git a/src/cmd/cmd-hissatsu.c b/src/cmd/cmd-hissatsu.c
index 5e074cc..9590349 100644 (file)
--- a/src/cmd/cmd-hissatsu.c
+++ b/src/cmd/cmd-hissatsu.c
@@ -12,7 +12,7 @@
 
 #include "system/angband.h"
 #include "core/stuff-handler.h"
-#include "util.h"
+#include "util/util.h"
 #include "main/sound-definitions-table.h"
 
 #include "monster/monsterrace-hook.h"

diff --git a/src/cmd/cmd-item.c b/src/cmd/cmd-item.c
index 69fc3c4..b7b30e5 100644 (file)
--- a/src/cmd/cmd-item.c
+++ b/src/cmd/cmd-item.c
@@ -12,7 +12,7 @@
 
 #include "system/angband.h"
 #include "core/stuff-handler.h"
-#include "util.h"
+#include "util/util.h"
 #include "main/sound-definitions-table.h"
 #include "term/gameterm.h"
 

diff --git a/src/cmd/cmd-magiceat.c b/src/cmd/cmd-magiceat.c
index eade1f6..b7a1065 100644 (file)
--- a/src/cmd/cmd-magiceat.c
+++ b/src/cmd/cmd-magiceat.c
@@ -53,7 +53,7 @@
  */
 
 #include "system/angband.h"
-#include "util.h"
+#include "util/util.h"
 #include "main/sound-definitions-table.h"
 #include "term/gameterm.h"
 

diff --git a/src/cmd/cmd-mane.c b/src/cmd/cmd-mane.c
index 07dea9d..b6e60df 100644 (file)
--- a/src/cmd/cmd-mane.c
+++ b/src/cmd/cmd-mane.c
@@ -12,7 +12,7 @@
 
 #include "system/angband.h"
 #include "core/stuff-handler.h"
-#include "util.h"
+#include "util/util.h"
 #include "main/sound-definitions-table.h"
 
 #include "floor/floor.h"

diff --git a/src/cmd/cmd-pet.c b/src/cmd/cmd-pet.c
index de16a4e..34304a2 100644 (file)
--- a/src/cmd/cmd-pet.c
+++ b/src/cmd/cmd-pet.c
@@ -1,6 +1,6 @@
 #include "system/angband.h"
 #include "core/stuff-handler.h"
-#include "util.h"
+#include "util/util.h"
 
 #include "io/write-diary.h"
 #include "cmd/cmd-dump.h"

diff --git a/src/cmd/cmd-quaff.c b/src/cmd/cmd-quaff.c
index 7b1875c..5cd9240 100644 (file)
--- a/src/cmd/cmd-quaff.c
+++ b/src/cmd/cmd-quaff.c
@@ -7,7 +7,7 @@
  */
 
 #include "system/angband.h"
-#include "util.h"
+#include "util/util.h"
 #include "main/sound-definitions-table.h"
 
 #include "birth/birth.h"

diff --git a/src/cmd/cmd-read.c b/src/cmd/cmd-read.c
index 103e025..e8a75b6 100644 (file)
--- a/src/cmd/cmd-read.c
+++ b/src/cmd/cmd-read.c
@@ -7,7 +7,7 @@
  */
 
 #include "system/angband.h"
-#include "util.h"
+#include "util/util.h"
 #include "main/sound-definitions-table.h"
 
 #include "object/object-flavor.h"

diff --git a/src/cmd/cmd-smith.c b/src/cmd/cmd-smith.c
index 71d212a..84cfdd4 100644 (file)
--- a/src/cmd/cmd-smith.c
+++ b/src/cmd/cmd-smith.c
@@ -1,5 +1,5 @@
 #include "system/angband.h"
-#include "util.h"
+#include "util/util.h"
 #include "term/gameterm.h"
 
 #include "object/object-flavor.h"

diff --git a/src/cmd/cmd-spell.c b/src/cmd/cmd-spell.c
index aebcb9c..b7ebd72 100644 (file)
--- a/src/cmd/cmd-spell.c
+++ b/src/cmd/cmd-spell.c
@@ -8,7 +8,7 @@
 
 #include "system/angband.h"
 #include "core/stuff-handler.h"
-#include "util.h"
+#include "util/util.h"
 #include "main/sound-definitions-table.h"
 #include "cmd/cmd-spell.h"
 

diff --git a/src/cmd/cmd-usestaff.c b/src/cmd/cmd-usestaff.c
index 6e3b05b..b8a8719 100644 (file)
--- a/src/cmd/cmd-usestaff.c
+++ b/src/cmd/cmd-usestaff.c
@@ -1,5 +1,5 @@
 #include "system/angband.h"
-#include "util.h"
+#include "util/util.h"
 #include "main/sound-definitions-table.h"
 
 #include "player/player-race.h"

diff --git a/src/cmd/cmd-zaprod.c b/src/cmd/cmd-zaprod.c
index 66d2538..4be5699 100644 (file)
--- a/src/cmd/cmd-zaprod.c
+++ b/src/cmd/cmd-zaprod.c
@@ -1,5 +1,5 @@
 #include "system/angband.h"
-#include "util.h"
+#include "util/util.h"
 #include "main/sound-definitions-table.h"
 
 #include "player/avatar.h"

diff --git a/src/cmd/cmd-zapwand.c b/src/cmd/cmd-zapwand.c
index c5107d9..86effc4 100644 (file)
--- a/src/cmd/cmd-zapwand.c
+++ b/src/cmd/cmd-zapwand.c
@@ -1,5 +1,5 @@
 #include "system/angband.h"
-#include "util.h"
+#include "util/util.h"
 #include "main/sound-definitions-table.h"
 
 #include "player/avatar.h"

diff --git a/src/combat/melee.c b/src/combat/melee.c
index 7ada849..b1e957b 100644 (file)
--- a/src/combat/melee.c
+++ b/src/combat/melee.c
@@ -13,7 +13,7 @@
 
 #include "system/angband.h"
 #include "core/stuff-handler.h"
-#include "util.h"
+#include "util/util.h"
 #include "main/sound-definitions-table.h"
 
 #include "object/artifact.h"

diff --git a/src/combat/shoot.c b/src/combat/shoot.c
index 7d8ba0b..889b39d 100644 (file)
--- a/src/combat/shoot.c
+++ b/src/combat/shoot.c
@@ -1,6 +1,6 @@
 #include "system/angband.h"
 #include "core/stuff-handler.h"
-#include "util.h"
+#include "util/util.h"
 #include "main/sound-definitions-table.h"
 #include "term/gameterm.h"
 

diff --git a/src/combat/snipe.c b/src/combat/snipe.c
index 05717c0..392105e 100644 (file)
--- a/src/combat/snipe.c
+++ b/src/combat/snipe.c
@@ -8,7 +8,7 @@
 
 #include "system/angband.h"
 #include "core/stuff-handler.h"
-#include "util.h"
+#include "util/util.h"
 #include "main/sound-definitions-table.h"
 #include "term/gameterm.h"
 

diff --git a/src/core/game-play.c b/src/core/game-play.c
index 4a84859..c2d24f8 100644 (file)
--- a/src/core/game-play.c
+++ b/src/core/game-play.c
@@ -13,7 +13,7 @@
 #include "system/angband.h"
 #include "core/game-play.h"
 #include "io/signal-handlers.h"
-#include "util.h"
+#include "util/util.h"
 #include "system/angband-version.h"
 #include "core/stuff-handler.h"
 #include "io/inet.h"

diff --git a/src/core/scores.c b/src/core/scores.c
index 4f02b2e..af8a5d6 100644 (file)
--- a/src/core/scores.c
+++ b/src/core/scores.c
@@ -13,7 +13,7 @@
 #include "system/angband.h"
 #include "io/signal-handlers.h"
 #include "term/gameterm.h"
-#include "util.h"
+#include "util/util.h"
 #include "core/turn-compensator.h"
 #include "system/angband-version.h"
 

diff --git a/src/dungeon/dungeon-file.c b/src/dungeon/dungeon-file.c
index e63405c..a2e9a93 100644 (file)
--- a/src/dungeon/dungeon-file.c
+++ b/src/dungeon/dungeon-file.c
@@ -32,7 +32,7 @@
  */
 
 #include "system/angband.h"
-#include "util.h"
+#include "util/util.h"
 #include "system/system-variables.h"
 
 #include "io/tokenizer.h"

diff --git a/src/dungeon/quest.c b/src/dungeon/quest.c
index 60e0216..0684a44 100644 (file)
--- a/src/dungeon/quest.c
+++ b/src/dungeon/quest.c
@@ -1,5 +1,5 @@
 #include "system/angband.h"
-#include "util.h"
+#include "util/util.h"
 #include "main/music-definitions-table.h"
 
 #include "system/system-variables.h"

diff --git a/src/floor/floor-events.c b/src/floor/floor-events.c
index 259d757..9ab698f 100644 (file)
--- a/src/floor/floor-events.c
+++ b/src/floor/floor-events.c
@@ -1,5 +1,5 @@
 #include "system/angband.h"
-#include "util.h"
+#include "util/util.h"
 
 #include "dungeon/dungeon.h"
 #include "floor/floor.h"

diff --git a/src/floor/floor-generate.c b/src/floor/floor-generate.c
index d604871..38c4b37 100644 (file)
--- a/src/floor/floor-generate.c
+++ b/src/floor/floor-generate.c
@@ -97,7 +97,7 @@
  */
 
 #include "system/angband.h"
-#include "util.h"
+#include "util/util.h"
 #include "system/system-variables.h"
 #include "market/building.h"
 

diff --git a/src/floor/floor-save.c b/src/floor/floor-save.c
index 1401cca..fa99d05 100644 (file)
--- a/src/floor/floor-save.c
+++ b/src/floor/floor-save.c
@@ -14,7 +14,7 @@
 #include "market/building.h"
 #include "system/system-variables.h"
 #include "io/load.h"
-#include "util.h"
+#include "util/util.h"
 
 #include "object/artifact.h"
 #include "dungeon/dungeon.h"

diff --git a/src/floor/floor-streams.c b/src/floor/floor-streams.c
index 00ae3f9..6ae8feb 100644 (file)
--- a/src/floor/floor-streams.c
+++ b/src/floor/floor-streams.c
@@ -16,7 +16,7 @@
  */
 
 #include "system/angband.h"
-#include "util.h"
+#include "util/util.h"
 
 #include "object/artifact.h"
 #include "floor/floor-generate.h"

diff --git a/src/floor/wild.c b/src/floor/wild.c
index 3a9b7bc..d142aef 100644 (file)
--- a/src/floor/wild.c
+++ b/src/floor/wild.c
@@ -11,7 +11,7 @@
  */
 
 #include "system/angband.h"
-#include "util.h"
+#include "util/util.h"
 #include "system/system-variables.h"
 
 #include "dungeon/dungeon.h"

diff --git a/src/grid/grid.c b/src/grid/grid.c
index 60e995b..2edfafc 100644 (file)
--- a/src/grid/grid.c
+++ b/src/grid/grid.c
@@ -16,7 +16,7 @@
  */
 
 #include "system/angband.h"
-#include "util.h"
+#include "util/util.h"
 #include "term/gameterm.h"
 
 #include "world/world.h"

diff --git a/src/grid/trap.c b/src/grid/trap.c
index 83743ab..4c694bf 100644 (file)
--- a/src/grid/trap.c
+++ b/src/grid/trap.c
@@ -1,5 +1,5 @@
 #include "system/angband.h"
-#include "util.h"
+#include "util/util.h"
 #include "main/sound-definitions-table.h"
 
 #include "io/write-diary.h"

diff --git a/src/inventory/player-inventory.c b/src/inventory/player-inventory.c
index 693bb7c..c0770f8 100644 (file)
--- a/src/inventory/player-inventory.c
+++ b/src/inventory/player-inventory.c
@@ -1,6 +1,6 @@
 #include "system/angband.h"
 #include "core/stuff-handler.h"
-#include "util.h"
+#include "util/util.h"
 #include "inventory/player-inventory.h"
 
 #include "term/gameterm.h"

diff --git a/src/io/chuukei.c b/src/io/chuukei.c
index 2d9cbde..6b1d8dd 100644 (file)
--- a/src/io/chuukei.c
+++ b/src/io/chuukei.c
@@ -10,7 +10,7 @@
 
 #include "io/signal-handlers.h"
 #include "io/files.h"
-#include "util.h"
+#include "util/util.h"
 #include "term/gameterm.h"
 #include "cmd/cmd-dump.h"
 #include "cmd/cmd-draw.h"

diff --git a/src/io/inet.c b/src/io/inet.c
index c5058ec..3683d91 100644 (file)
--- a/src/io/inet.c
+++ b/src/io/inet.c
@@ -1,7 +1,7 @@
 /* File: inet.c */
 
 #include "system/angband.h"
-#include "util.h"
+#include "util/util.h"
 #include "io/files.h"
 #include "io/inet.h"
 

diff --git a/src/io/load.c b/src/io/load.c
index 508e01d..fd09ee0 100644 (file)
--- a/src/io/load.c
+++ b/src/io/load.c
@@ -41,7 +41,7 @@
  */
 
 #include "system/angband.h"
-#include "util.h"
+#include "util/util.h"
 #include "system/system-variables.h" // 暫定、init_flags の扱いを決めた上で消す.
 #include "system/angband-version.h"
 

diff --git a/src/io/save.c b/src/io/save.c
index b2300d5..f9afd45 100644 (file)
--- a/src/io/save.c
+++ b/src/io/save.c
@@ -12,7 +12,7 @@
  */
 
 #include "system/angband.h"
-#include "util.h"
+#include "util/util.h"
 #include "io/save.h"
 #include "io/load.h"
 #include "io/report.h"

diff --git a/src/io/targeting.c b/src/io/targeting.c
index 58dc531..0f954f8 100644 (file)
--- a/src/io/targeting.c
+++ b/src/io/targeting.c
@@ -11,7 +11,7 @@
  */
 
 #include "system/angband.h"
-#include "util.h"
+#include "util/util.h"
 #include "system/system-variables.h"
 #include "core/stuff-handler.h"
 #include "term/gameterm.h"

diff --git a/src/locale/english.c b/src/locale/english.c
index 415fa49..9742fc4 100644 (file)
--- a/src/locale/english.c
+++ b/src/locale/english.c
@@ -1,6 +1,6 @@
 
 #include "system/angband.h"
-#include "util.h"
+#include "util/util.h"
 #include "japanese.h"
 
 

diff --git a/src/locale/japanese.c b/src/locale/japanese.c
index b89d9ae..29a9266 100644 (file)
--- a/src/locale/japanese.c
+++ b/src/locale/japanese.c
@@ -5,7 +5,7 @@
  */
 
 #include "system/angband.h"
-#include "util.h"
+#include "util/util.h"
 #include "japanese.h"
 
 #ifdef JP

diff --git a/src/main-win.c b/src/main-win.c
index 7a0ee19..efed953 100644 (file)
--- a/src/main-win.c
+++ b/src/main-win.c
@@ -93,7 +93,7 @@
 #include "io/signal-handlers.h"
 #include "main/sound-definitions-table.h"
 #include "main/music-definitions-table.h"
-#include "util.h"
+#include "util/util.h"
 #include "io/inet.h"
 #include "io/chuukei.h"
 

diff --git a/src/main.c b/src/main.c
index 8760fec..949a2e0 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -15,7 +15,7 @@
 #include "io/files.h"
 #include "io/inet.h"
 #include "main/init.h"
-#include "scores.h"
+#include "core/scores.h"
 #include "term/gameterm.h"
 #include "player/process-name.h"
 #include "io/chuukei.h"

diff --git a/src/main/init.c b/src/main/init.c
index b59924f..6ea80f9 100644 (file)
--- a/src/main/init.c
+++ b/src/main/init.c
@@ -31,7 +31,7 @@
  */
 
 #include "system/angband.h"
-#include "util.h"
+#include "util/util.h"
 #include "io/uid-checker.h"
 #include "io/files.h"
 #include "system/system-variables.h"

diff --git a/src/market/building.c b/src/market/building.c
index d50355d..8f63036 100644 (file)
--- a/src/market/building.c
+++ b/src/market/building.c
@@ -13,7 +13,7 @@
 */
 
 #include "system/angband.h"
-#include "util.h"
+#include "util/util.h"
 #include "main/music-definitions-table.h"
 #include "term/gameterm.h"
 

diff --git a/src/market/rumor.c b/src/market/rumor.c
index db1aeba..09f214d 100644 (file)
--- a/src/market/rumor.c
+++ b/src/market/rumor.c
@@ -1,6 +1,6 @@
 #include "system/angband.h"
 #include "market/rumor.h"
-#include "util.h"
+#include "util/util.h"
 
 #include "io/tokenizer.h"
 #include "io/files.h"

diff --git a/src/market/store.c b/src/market/store.c
index b555bf6..de8ab4f 100644 (file)
--- a/src/market/store.c
+++ b/src/market/store.c
@@ -18,7 +18,7 @@
 #include "market/store-util.h"
 #include "market/black-market.h"
 #include "core/stuff-handler.h"
-#include "util.h"
+#include "util/util.h"
 #include "main/music-definitions-table.h"
 #include "main/sound-definitions-table.h"
 #include "term/gameterm.h"

diff --git a/src/mind/mind.c b/src/mind/mind.c
index e67056b..67368f1 100644 (file)
--- a/src/mind/mind.c
+++ b/src/mind/mind.c
@@ -16,7 +16,7 @@
 
 #include "system/angband.h"
 #include "core/stuff-handler.h"
-#include "util.h"
+#include "util/util.h"
 #include "main/sound-definitions-table.h"
 
 #include "mind/mind.h"

diff --git a/src/mind/racial.c b/src/mind/racial.c
index 0e603da..9b012f0 100644 (file)
--- a/src/mind/racial.c
+++ b/src/mind/racial.c
@@ -13,7 +13,7 @@
 #include "system/angband.h"
 #include "mind/racial.h"
 #include "core/stuff-handler.h"
-#include "util.h"
+#include "util/util.h"
 
 #include "cmd-basic.h"
 #include "cmd-magiceat.h"

diff --git a/src/monster/monster-process.c b/src/monster/monster-process.c
index 9b6d119..a01f56b 100644 (file)
--- a/src/monster/monster-process.c
+++ b/src/monster/monster-process.c
@@ -14,7 +14,7 @@
  */
 
 #include "system/angband.h"
-#include "util.h"
+#include "util/util.h"
 #include "monster/monster-direction.h"
 #include "monster/monster-move.h"
 #include "monster/monster-runaway.h"

diff --git a/src/monster/monster-race.c b/src/monster/monster-race.c
index e77ff7d..c8c4daf 100644 (file)
--- a/src/monster/monster-race.c
+++ b/src/monster/monster-race.c
@@ -1,6 +1,6 @@
 #include "system/angband.h"
 #include "monster/monster-race.h"
-#include "util.h"
+#include "util/util.h"
 
 extern monster_race *r_info;
 extern char *r_name;

diff --git a/src/monster/monster-race.h b/src/monster/monster-race.h
index eebdf28..d2ea5b3 100644 (file)
--- a/src/monster/monster-race.h
+++ b/src/monster/monster-race.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "util.h"
+#include "util/util.h"
 
 /*
  * Monster blow structure

diff --git a/src/monster/monster-status.c b/src/monster/monster-status.c
index d032df9..fce59e4 100644 (file)
--- a/src/monster/monster-status.c
+++ b/src/monster/monster-status.c
@@ -1,6 +1,6 @@
 #include "system/angband.h"
 #include "core/stuff-handler.h"
-#include "util.h"
+#include "util/util.h"
 #include "main/sound-definitions-table.h"
 
 #include "monster/creature.h"

diff --git a/src/monster/monster1.c b/src/monster/monster1.c
index 868af55..0bf0504 100644 (file)
--- a/src/monster/monster1.c
+++ b/src/monster/monster1.c
@@ -11,7 +11,7 @@
  */
 
 #include "system/angband.h"
-#include "util.h"
+#include "util/util.h"
 #include "main/music-definitions-table.h"
 #include "term/gameterm.h"
 

diff --git a/src/monster/monster2.c b/src/monster/monster2.c
index 8b6d966..f6d0499 100644 (file)
--- a/src/monster/monster2.c
+++ b/src/monster/monster2.c
@@ -11,7 +11,7 @@
  */
 
 #include "system/angband.h"
-#include "util.h"
+#include "util/util.h"
 #include "main/sound-definitions-table.h"
 #include "system/system-variables.h"
 

diff --git a/src/monster/monsterrace-hook.c b/src/monster/monsterrace-hook.c
index b72821e..2e53670 100644 (file)
--- a/src/monster/monsterrace-hook.c
+++ b/src/monster/monsterrace-hook.c
@@ -1,5 +1,5 @@
 #include "system/angband.h"
-#include "util.h"
+#include "util/util.h"
 
 #include "monster/monsterrace-hook.h"
 #include "monster/monster.h"

diff --git a/src/mutation/mutation.c b/src/mutation/mutation.c
index fd6509f..6363e65 100644 (file)
--- a/src/mutation/mutation.c
+++ b/src/mutation/mutation.c
@@ -14,7 +14,7 @@
 #include "system/angband.h"
 #include "core/stuff-handler.h"
 #include "core/show-file.h"
-#include "util.h"
+#include "util/util.h"
 
 #include "io/write-diary.h"
 #include "cmd/cmd-dump.h"

diff --git a/src/object/artifact.c b/src/object/artifact.c
index b00fc00..ea4658c 100644 (file)
--- a/src/object/artifact.c
+++ b/src/object/artifact.c
@@ -11,7 +11,7 @@
  */
 
 #include "system/angband.h"
-#include "util.h"
+#include "util/util.h"
 
 #include "object/artifact.h"
 #include "cmd-smith.h"

diff --git a/src/object/chest.c b/src/object/chest.c
index 94bb9df..db4be08 100644 (file)
--- a/src/object/chest.c
+++ b/src/object/chest.c
@@ -1,6 +1,6 @@
 #include "system/angband.h"
 #include "object/chest.h"
-#include "util.h"
+#include "util/util.h"
 #include "main/sound-definitions-table.h"
 
 #include "spell/spells-type.h"

diff --git a/src/object/object-curse.c b/src/object/object-curse.c
index 228845f..f07d412 100644 (file)
--- a/src/object/object-curse.c
+++ b/src/object/object-curse.c
@@ -1,5 +1,5 @@
 #include "system/angband.h"
-#include "util.h"
+#include "util/util.h"
 
 #include "object/object-flavor.h"
 #include "object/object-hook.h"

diff --git a/src/object/object-flavor.c b/src/object/object-flavor.c
index e1ad563..12df9aa 100644 (file)
--- a/src/object/object-flavor.c
+++ b/src/object/object-flavor.c
@@ -11,7 +11,7 @@
  */
 
 #include "system/angband.h"
-#include "util.h"
+#include "util/util.h"
 
 #include "cmd-smith.h"
 #include "object/artifact.h"

diff --git a/src/object/object-hook.c b/src/object/object-hook.c
index 9b9c552..ac69069 100644 (file)
--- a/src/object/object-hook.c
+++ b/src/object/object-hook.c
@@ -1,6 +1,6 @@
 
 #include "system/angband.h"
-#include "util.h"
+#include "util/util.h"
 
 #include "object/object-hook.h"
 #include "monster/monster.h"

diff --git a/src/object/object-kind.c b/src/object/object-kind.c
index f6f93b4..6d9e8e1 100644 (file)
--- a/src/object/object-kind.c
+++ b/src/object/object-kind.c
@@ -1,5 +1,5 @@
 #include "system/angband.h"
-#include "util.h"
+#include "util/util.h"
 #include "object-kind.h"
 
 /*

diff --git a/src/object/object-kind.h b/src/object/object-kind.h
index c09227d..5d07da9 100644 (file)
--- a/src/object/object-kind.h
+++ b/src/object/object-kind.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "util.h"
+#include "util/util.h"
 
 /*!
  * @struct object_kind

diff --git a/src/object/object1.c b/src/object/object1.c
index 3ec74ca..110081a 100644 (file)
--- a/src/object/object1.c
+++ b/src/object/object1.c
@@ -14,7 +14,7 @@
 #include "system/angband.h"
 #include "system/system-variables.h"
 #include "io/read-pref-file.h"
-#include "util.h"
+#include "util/util.h"
 
 #include "object/artifact.h"
 #include "floor/floor.h"

diff --git a/src/object/object2.c b/src/object/object2.c
index 6235721..08ebe3d 100644 (file)
--- a/src/object/object2.c
+++ b/src/object/object2.c
@@ -12,7 +12,7 @@
  */
 
 #include "system/angband.h"
-#include "util.h"
+#include "util/util.h"
 #include "main/sound-definitions-table.h"
 #include "world/world.h"
 #include "term/gameterm.h"

diff --git a/src/object/warning.c b/src/object/warning.c
index 8d2f248..2322715 100644 (file)
--- a/src/object/warning.c
+++ b/src/object/warning.c
@@ -1,6 +1,6 @@
 
 #include "system/angband.h"
-#include "util.h"
+#include "util/util.h"
 
 #include "object/artifact.h"
 #include "player/player-move.h"

diff --git a/src/player/patron.c b/src/player/patron.c
index 243e4ef..9a154b9 100644 (file)
--- a/src/player/patron.c
+++ b/src/player/patron.c
@@ -1,5 +1,5 @@
 #include "system/angband.h"
-#include "util.h"
+#include "util/util.h"
 
 #include "io/write-diary.h"
 #include "cmd/cmd-dump.h"

diff --git a/src/player/player-damage.c b/src/player/player-damage.c
index 75409e7..8770c13 100644 (file)
--- a/src/player/player-damage.c
+++ b/src/player/player-damage.c
@@ -1,6 +1,6 @@
 #include "system/angband.h"
 #include "core/stuff-handler.h"
-#include "util.h"
+#include "util/util.h"
 #include "main/music-definitions-table.h"
 #include "main/sound-definitions-table.h"
 #include "term/gameterm.h"

diff --git a/src/player/player-effects.c b/src/player/player-effects.c
index 6932e1d..fba32e5 100644 (file)
--- a/src/player/player-effects.c
+++ b/src/player/player-effects.c
@@ -15,7 +15,7 @@
 #include "system/angband.h"
 #include "term/gameterm.h"
 #include "core/stuff-handler.h"
-#include "util.h"
+#include "util/util.h"
 
 #include "monster/creature.h"
 

diff --git a/src/player/player-move.c b/src/player/player-move.c
index 2e7d7d0..af7d6fc 100644 (file)
--- a/src/player/player-move.c
+++ b/src/player/player-move.c
@@ -142,7 +142,7 @@
 #include "system/angband.h"
 #include "core/stuff-handler.h"
 #include "core/special-internal-keys.h"
-#include "util.h"
+#include "util/util.h"
 #include "main/sound-definitions-table.h"
 
 #include "realm/realm-song.h"

diff --git a/src/player/player-status.c b/src/player/player-status.c
index 26dec8b..1762d4f 100644 (file)
--- a/src/player/player-status.c
+++ b/src/player/player-status.c
@@ -1,6 +1,6 @@
 #include "system/angband.h"
 #include "core/stuff-handler.h"
-#include "util.h"
+#include "util/util.h"
 #include "main/sound-definitions-table.h"
 
 #include "market/building.h"

diff --git a/src/player/selfinfo.c b/src/player/selfinfo.c
index 99b4c5a..ba42e28 100644 (file)
--- a/src/player/selfinfo.c
+++ b/src/player/selfinfo.c
@@ -16,7 +16,7 @@
 
 #include "system/angband.h"
 #include "player/selfinfo.h"
-#include "util.h"
+#include "util/util.h"
 
 #include "player/player-status.h"
 #include "player/player-race.h"

diff --git a/src/realm/realm-arcane.c b/src/realm/realm-arcane.c
index 2e29d32..8ed9d1f 100644 (file)
--- a/src/realm/realm-arcane.c
+++ b/src/realm/realm-arcane.c
@@ -1,5 +1,5 @@
 #include "system/angband.h"
-#include "util.h"
+#include "util/util.h"
 
 #include "cmd-spell.h"
 #include "player/avatar.h"

diff --git a/src/realm/realm-chaos.c b/src/realm/realm-chaos.c
index cd418fc..aea0231 100644 (file)
--- a/src/realm/realm-chaos.c
+++ b/src/realm/realm-chaos.c
@@ -1,5 +1,5 @@
 #include "system/angband.h"
-#include "util.h"
+#include "util/util.h"
 
 #include "cmd-spell.h"
 #include "player/player-class.h"

diff --git a/src/realm/realm-craft.c b/src/realm/realm-craft.c
index 084b2e3..59dbb16 100644 (file)
--- a/src/realm/realm-craft.c
+++ b/src/realm/realm-craft.c
@@ -1,5 +1,5 @@
 #include "system/angband.h"
-#include "util.h"
+#include "util/util.h"
 
 #include "cmd-spell.h"
 #include "player/selfinfo.h"

diff --git a/src/realm/realm-crusade.c b/src/realm/realm-crusade.c
index 322d1ef..80be39d 100644 (file)
--- a/src/realm/realm-crusade.c
+++ b/src/realm/realm-crusade.c
@@ -1,5 +1,5 @@
 #include "system/angband.h"
-#include "util.h"
+#include "util/util.h"
 
 #include "world/world.h"
 #include "cmd-spell.h"

diff --git a/src/realm/realm-daemon.c b/src/realm/realm-daemon.c
index 48ef2a9..6f4d291 100644 (file)
--- a/src/realm/realm-daemon.c
+++ b/src/realm/realm-daemon.c
@@ -1,5 +1,5 @@
 #include "system/angband.h"
-#include "util.h"
+#include "util/util.h"
 
 #include "player/player-class.h"
 #include "cmd-spell.h"

diff --git a/src/realm/realm-hex.c b/src/realm/realm-hex.c
index 7910f7f..f0050aa 100644 (file)
--- a/src/realm/realm-hex.c
+++ b/src/realm/realm-hex.c
@@ -16,7 +16,7 @@
  */
 
 #include "system/angband.h"
-#include "util.h"
+#include "util/util.h"
 
 #include "effect/effect-characteristics.h"
 #include "cmd-spell.h"

diff --git a/src/realm/realm-hissatsu.c b/src/realm/realm-hissatsu.c
index 713f531..6dba94d 100644 (file)
--- a/src/realm/realm-hissatsu.c
+++ b/src/realm/realm-hissatsu.c
@@ -1,6 +1,6 @@
 #include "system/angband.h"
 #include "core/stuff-handler.h"
-#include "util.h"
+#include "util/util.h"
 
 #include "cmd-spell.h"
 #include "cmd-basic.h"

diff --git a/src/realm/realm-nature.c b/src/realm/realm-nature.c
index f376b0d..8131fdc 100644 (file)
--- a/src/realm/realm-nature.c
+++ b/src/realm/realm-nature.c
@@ -1,5 +1,5 @@
 #include "system/angband.h"
-#include "util.h"
+#include "util/util.h"
 
 #include "cmd-spell.h"
 #include "spell/spells-summon.h"

diff --git a/src/realm/realm-song.c b/src/realm/realm-song.c
index 440977b..28178bb 100644 (file)
--- a/src/realm/realm-song.c
+++ b/src/realm/realm-song.c
@@ -1,5 +1,5 @@
 #include "system/angband.h"
-#include "util.h"
+#include "util/util.h"
 
 #include "cmd-spell.h"
 #include "spell/spells-type.h"

diff --git a/src/realm/realm-sorcery.c b/src/realm/realm-sorcery.c
index ed098b5..306cfcb 100644 (file)
--- a/src/realm/realm-sorcery.c
+++ b/src/realm/realm-sorcery.c
@@ -1,5 +1,5 @@
 #include "system/angband.h"
-#include "util.h"
+#include "util/util.h"
 
 #include "cmd-spell.h"
 #include "player/selfinfo.h"

diff --git a/src/realm/realm-trump.c b/src/realm/realm-trump.c
index 1767c15..9e56d4b 100644 (file)
--- a/src/realm/realm-trump.c
+++ b/src/realm/realm-trump.c
@@ -1,5 +1,5 @@
 #include "system/angband.h"
-#include "util.h"
+#include "util/util.h"
 
 #include "cmd-spell.h"
 #include "mutation/mutation.h"

diff --git a/src/room/rooms-city.c b/src/room/rooms-city.c
index b787f44..e8b54c5 100644 (file)
--- a/src/room/rooms-city.c
+++ b/src/room/rooms-city.c
@@ -1,5 +1,5 @@
 #include "system/angband.h"
-#include "util.h"
+#include "util/util.h"
 
 #include "grid/grid.h"
 #include "floor/floor.h"

diff --git a/src/room/rooms-pit-nest.c b/src/room/rooms-pit-nest.c
index 6175ef5..2282f13 100644 (file)
--- a/src/room/rooms-pit-nest.c
+++ b/src/room/rooms-pit-nest.c
@@ -1,5 +1,5 @@
 #include "system/angband.h"
-#include "util.h"
+#include "util/util.h"
 
 #include "grid/grid.h"
 #include "floor/floor-generate.h"

diff --git a/src/room/rooms-special.c b/src/room/rooms-special.c
index 0afb079..3875082 100644 (file)
--- a/src/room/rooms-special.c
+++ b/src/room/rooms-special.c
@@ -1,5 +1,5 @@
 #include "system/angband.h"
-#include "util.h"
+#include "util/util.h"
 
 #include "grid/grid.h"
 #include "floor/floor-generate.h"

diff --git a/src/room/rooms-trap.c b/src/room/rooms-trap.c
index e5faf44..0b3add4 100644 (file)
--- a/src/room/rooms-trap.c
+++ b/src/room/rooms-trap.c
@@ -1,5 +1,5 @@
 #include "system/angband.h"
-#include "util.h"
+#include "util/util.h"
 
 #include "grid/grid.h"
 #include "floor/floor-generate.h"

diff --git a/src/room/rooms-vault.c b/src/room/rooms-vault.c
index 1d4fe62..a5e3423 100644 (file)
--- a/src/room/rooms-vault.c
+++ b/src/room/rooms-vault.c
@@ -1,5 +1,5 @@
 #include "system/angband.h"
-#include "util.h"
+#include "util/util.h"
 #include "room/rooms-vault.h"
 
 #include "floor/floor-generate.h"

diff --git a/src/room/rooms.c b/src/room/rooms.c
index bcc6f32..9a755bb 100644 (file)
--- a/src/room/rooms.c
+++ b/src/room/rooms.c
@@ -37,7 +37,7 @@
  */
 
 #include "system/angband.h"
-#include "util.h"
+#include "util/util.h"
 
 #include "grid/feature.h"
 #include "floor/floor.h"

diff --git a/src/spell/mspells1.c b/src/spell/mspells1.c
index 919ced1..f997375 100644 (file)
--- a/src/spell/mspells1.c
+++ b/src/spell/mspells1.c
@@ -39,7 +39,7 @@
  */
 
 #include "system/angband.h"
-#include "util.h"
+#include "util/util.h"
 
 #include "effect/effect-characteristics.h"
 #include "dungeon/dungeon.h"

diff --git a/src/spell/mspells2.c b/src/spell/mspells2.c
index 0750497..593cb4a 100644 (file)
--- a/src/spell/mspells2.c
+++ b/src/spell/mspells2.c
@@ -12,7 +12,7 @@
  */
 
 #include "system/angband.h"
-#include "util.h"
+#include "util/util.h"
 #include "main/sound-definitions-table.h"
 
 #include "cmd-pet.h"

diff --git a/src/spell/mspells3.c b/src/spell/mspells3.c
index 45a2324..51b8673 100644 (file)
--- a/src/spell/mspells3.c
+++ b/src/spell/mspells3.c
@@ -12,7 +12,7 @@
 
 #include "system/angband.h"
 #include "core/stuff-handler.h"
-#include "util.h"
+#include "util/util.h"
 #include "main/sound-definitions-table.h"
 
 #include "floor/floor.h"

diff --git a/src/spell/mspells4.c b/src/spell/mspells4.c
index 8d3f334..c288926 100644 (file)
--- a/src/spell/mspells4.c
+++ b/src/spell/mspells4.c
@@ -6,7 +6,7 @@
  */
 
 #include "system/angband.h"
-#include "util.h"
+#include "util/util.h"
 #include "main/sound-definitions-table.h"
 
 #include "effect/effect-characteristics.h"

diff --git a/src/spell/spells-floor.c b/src/spell/spells-floor.c
index 5c4af83..7ed3804 100644 (file)
--- a/src/spell/spells-floor.c
+++ b/src/spell/spells-floor.c
@@ -1,5 +1,5 @@
 #include "system/angband.h"
-#include "util.h"
+#include "util/util.h"
 
 #include "dungeon/dungeon.h"
 #include "floor/floor.h"

diff --git a/src/spell/spells-object.c b/src/spell/spells-object.c
index 43e2f9b..6680e0f 100644 (file)
--- a/src/spell/spells-object.c
+++ b/src/spell/spells-object.c
@@ -1,6 +1,6 @@
 
 #include "system/angband.h"
-#include "util.h"
+#include "util/util.h"
 
 #include "cmd-basic.h"
 #include "object/artifact.h"

diff --git a/src/spell/spells-status.c b/src/spell/spells-status.c
index 841c766..f0d5a7e 100644 (file)
--- a/src/spell/spells-status.c
+++ b/src/spell/spells-status.c
@@ -1,6 +1,6 @@
 #include "system/angband.h"
 #include "core/stuff-handler.h"
-#include "util.h"
+#include "util/util.h"
 
 #include "cmd-magiceat.h"
 #include "player/avatar.h"

diff --git a/src/spell/spells-summon.c b/src/spell/spells-summon.c
index 9bbf1ae..4aa8524 100644 (file)
--- a/src/spell/spells-summon.c
+++ b/src/spell/spells-summon.c
@@ -1,5 +1,5 @@
 #include "system/angband.h"
-#include "util.h"
+#include "util/util.h"
 
 #include "spell/spells-summon.h"
 #include "inventory/player-inventory.h"

diff --git a/src/spell/spells-world.c b/src/spell/spells-world.c
index 401cde4..cb10bde 100644 (file)
--- a/src/spell/spells-world.c
+++ b/src/spell/spells-world.c
@@ -1,6 +1,6 @@
 #include "system/angband.h"
 #include "spell/spells-world.h"
-#include "util.h"
+#include "util/util.h"
 #include "world/world.h"
 
 /*!

diff --git a/src/spell/spells1.c b/src/spell/spells1.c
index a1f3bb8..73eff0f 100644 (file)
--- a/src/spell/spells1.c
+++ b/src/spell/spells1.c
@@ -13,7 +13,7 @@
 
 #include "system/angband.h"
 #include "system/system-variables.h"
-#include "util.h"
+#include "util/util.h"
 #include "main/sound-definitions-table.h"
 #include "cmd/cmd-pet.h"
 #include "cmd/cmd-dump.h"

diff --git a/src/spell/spells2.c b/src/spell/spells2.c
index 406e757..e35e1c5 100644 (file)
--- a/src/spell/spells2.c
+++ b/src/spell/spells2.c
@@ -14,7 +14,7 @@
 #include "system/angband.h"
 #include "system/system-variables.h"
 #include "core/stuff-handler.h"
-#include "util.h"
+#include "util/util.h"
 #include "main/sound-definitions-table.h"
 
 #include "monster/creature.h"

diff --git a/src/spell/spells3.c b/src/spell/spells3.c
index 1518d2c..7931ca9 100644 (file)
--- a/src/spell/spells3.c
+++ b/src/spell/spells3.c
@@ -15,7 +15,7 @@
 #include "market/building.h"
 #include "core/stuff-handler.h"
 #include "term/gameterm.h"
-#include "util.h"
+#include "util/util.h"
 #include "main/sound-definitions-table.h"
 #include "object/object-ego.h"
 

diff --git a/src/term/gameterm.c b/src/term/gameterm.c
index aad892f..f13bfb0 100644 (file)
--- a/src/term/gameterm.c
+++ b/src/term/gameterm.c
@@ -1,5 +1,5 @@
 #include "system/angband.h"
-#include "util.h"
+#include "util/util.h"
 
 #include "term/gameterm.h"
 #include "system/system-variables.h"

diff --git a/src/util.c b/src/util/util.c
similarity index 99%
rename from src/util.c
rename to src/util/util.c
index 7bc68e5..44dd6d6 100644 (file)
--- a/src/util.c
+++ b/src/util/util.c
@@ -16,7 +16,7 @@
 #include "system/system-variables.h"
 #include "core/stuff-handler.h"
 #include "term/gameterm.h"
-#include "util.h"
+#include "util/util.h"
 #include "io/files.h"
 #include "monster/monsterrace-hook.h"
 #include "view/display-main-window.h"

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

diff --git a/src/view/display-main-window.c b/src/view/display-main-window.c
index 38f29c9..1e85597 100644 (file)
--- a/src/view/display-main-window.c
+++ b/src/view/display-main-window.c
@@ -11,7 +11,7 @@
  */
 
 #include "system/angband.h"
-#include "util.h"
+#include "util/util.h"
 #include "autopick/autopick-finder.h"
 #include "autopick/autopick-methods-table.h"
 #include "autopick/autopick-util.h"

diff --git a/src/wizard/wizard-special-process.c b/src/wizard/wizard-special-process.c
index c81b04b..f7c6221 100644 (file)
--- a/src/wizard/wizard-special-process.c
+++ b/src/wizard/wizard-special-process.c
@@ -23,7 +23,7 @@
 #include "cmd/cmd-dump.h"
 #include "cmd/cmd-help.h"
 #include "cmd/cmd-save.h"
-#include "util.h"
+#include "util/util.h"
 #include "birth/birth.h"
 #include "player/selfinfo.h"
 #include "player/patron.h"

diff --git a/src/wizard/wizard-spoiler.c b/src/wizard/wizard-spoiler.c
index e9a5241..6406fed 100644 (file)
--- a/src/wizard/wizard-spoiler.c
+++ b/src/wizard/wizard-spoiler.c
@@ -12,7 +12,7 @@
 
 #include "system/angband.h"
 #include "wizard/wizard-spoiler.h"
-#include "util.h"
+#include "util/util.h"
 #include "term/gameterm.h"
 
 #include "system/angband-version.h"