[Refactor] #40413 Separated sound-of-music.c/h from util.c/h

diff --git a/Hengband/Hengband/Hengband.vcxproj b/Hengband/Hengband/Hengband.vcxproj
index 86a3dd8..dc1c213 100644 (file)
--- a/Hengband/Hengband/Hengband.vcxproj
+++ b/Hengband/Hengband/Hengband.vcxproj
@@ -205,6 +205,7 @@
     <ClCompile Include="..\..\src\lore\magic-types-setter.c" />\r
     <ClCompile Include="..\..\src\lore\lore-calculator.c" />\r
     <ClCompile Include="..\..\src\lore\lore-util.c" />\r
+    <ClCompile Include="..\..\src\main\sound-of-music.c" />\r
     <ClCompile Include="..\..\src\monster-floor\monster-summon.c" />\r
     <ClCompile Include="..\..\src\monster-floor\one-monster-placer.c" />\r
     <ClCompile Include="..\..\src\monster\monster-compaction.c" />\r
@@ -578,6 +579,7 @@
     <ClInclude Include="..\..\src\lore\magic-types-setter.h" />\r
     <ClInclude Include="..\..\src\lore\lore-calculator.h" />\r
     <ClInclude Include="..\..\src\lore\lore-util.h" />\r
+    <ClInclude Include="..\..\src\main\sound-of-music.h" />\r
     <ClInclude Include="..\..\src\mind\drs-types.h" />\r
     <ClInclude Include="..\..\src\mind\snipe-types.h" />\r
     <ClInclude Include="..\..\src\monster-floor\monster-summon.h" />\r

diff --git a/Hengband/Hengband/Hengband.vcxproj.filters b/Hengband/Hengband/Hengband.vcxproj.filters
index 34c33e9..c959add 100644 (file)
--- a/Hengband/Hengband/Hengband.vcxproj.filters
+++ b/Hengband/Hengband/Hengband.vcxproj.filters
@@ -1364,6 +1364,9 @@
     <ClCompile Include="..\..\src\cmd-io\macro-util.c">
       <Filter>cmd-io</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\main\sound-of-music.c">
+      <Filter>main</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\src\cmd\cmd-basic.h">
@@ -2989,6 +2992,9 @@
     <ClInclude Include="..\..\src\cmd-io\macro-util.h">
       <Filter>cmd-io</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\main\sound-of-music.h">
+      <Filter>main</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\src\wall.bmp" />

diff --git a/src/Makefile.am b/src/Makefile.am
index 0e4ef9b..354eb82 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -252,10 +252,11 @@ hengband_SOURCES = \
        \
        main.c main-x11.c main-gcu.c \
        \
+       main/init.c main/init.h \
        main/music-definitions-table.c main/music-definitions-table.h \
        main/sound-definitions-table.c main/sound-definitions-table.h \
+       main/sound-of-music.c main/sound-of-music.h \
        main/x11-gamma-builder.c main/x11-gamma-builder.h \
-       main/init.c main/init.h \
        \
        market/arena-info-table.c market/arena-info-table.h \
        market/building-util.c market/building-util.h \

diff --git a/src/autopick/autopick-finder.c b/src/autopick/autopick-finder.c
index 6f9bd84..20fa5ee 100644 (file)
--- a/src/autopick/autopick-finder.c
+++ b/src/autopick/autopick-finder.c
@@ -10,6 +10,7 @@
 #include "autopick/autopick-entry.h"
 #include "autopick/autopick-matcher.h"
 #include "inventory/player-inventory.h"
+#include "main/sound-of-music.h"
 #include "object/item-use-flags.h"
 #include "object/object-flavor.h"
 #include "term/term-color-types.h"

diff --git a/src/autopick/autopick-inserter-killer.c b/src/autopick/autopick-inserter-killer.c
index 9ebfe37..a34ab2c 100644 (file)
--- a/src/autopick/autopick-inserter-killer.c
+++ b/src/autopick/autopick-inserter-killer.c
@@ -2,6 +2,7 @@
 #include "autopick/autopick-dirty-flags.h"
 #include "cmd-io/macro-util.h"
 #include "game-option/input-options.h"
+#include "main/sound-of-music.h"
 #include "util/string-processor.h"
 
 /*

diff --git a/src/autopick/autopick-util.c b/src/autopick/autopick-util.c
index e8258b5..505b962 100644 (file)
--- a/src/autopick/autopick-util.c
+++ b/src/autopick/autopick-util.c
@@ -1,6 +1,7 @@
 #include "autopick/autopick-util.h"
 #include "autopick/autopick-menu-data-table.h"
 #include "game-option/input-options.h"
+#include "main/sound-of-music.h"
 #include "monster-race/race-indice-types.h"
 #include "object-enchant/item-feeling.h"
 

diff --git a/src/birth/auto-roller.c b/src/birth/auto-roller.c
index 83de299..4837e3e 100644 (file)
--- a/src/birth/auto-roller.c
+++ b/src/birth/auto-roller.c
@@ -2,6 +2,7 @@
 #include "birth/birth-stat.h"
 #include "birth/birth-util.h"
 #include "cmd-io/cmd-gameoption.h"
+#include "main/sound-of-music.h"
 #include "player/player-personality.h"
 #include "system/game-option-types.h"
 #include "term/term-color-types.h"

diff --git a/src/birth/birth-util.c b/src/birth/birth-util.c
index 597f971..bcca7d0 100644 (file)
--- a/src/birth/birth-util.c
+++ b/src/birth/birth-util.c
@@ -2,6 +2,7 @@
 #include "birth/birth-util.h"
 #include "cmd-io/cmd-gameoption.h"
 #include "core/show-file.h"
+#include "main/sound-of-music.h"
 #include "system/game-option-types.h"
 
 /*!

diff --git a/src/birth/birth-wizard.c b/src/birth/birth-wizard.c
index df71875..5d40941 100644 (file)
--- a/src/birth/birth-wizard.c
+++ b/src/birth/birth-wizard.c
@@ -16,6 +16,7 @@
 #include "cmd-io/cmd-help.h"
 #include "game-option/birth-options.h"
 #include "main/sound-definitions-table.h"
+#include "main/sound-of-music.h"
 #include "player/avatar.h"
 #include "player/patron.h"
 #include "player/player-sex.h"

diff --git a/src/birth/character-builder.c b/src/birth/character-builder.c
index 08a395d..8060700 100644 (file)
--- a/src/birth/character-builder.c
+++ b/src/birth/character-builder.c
@@ -21,6 +21,7 @@
 #include "game-option/option-flags.h"
 #include "io/write-diary.h"
 #include "main/music-definitions-table.h"
+#include "main/sound-of-music.h"
 #include "monster-floor/monster-remover.h"
 #include "player/player-race-types.h"
 #include "player/player-sex.h"

diff --git a/src/cmd-action/cmd-attack.c b/src/cmd-action/cmd-attack.c
index 76a0535..11ac70d 100644 (file)
--- a/src/cmd-action/cmd-attack.c
+++ b/src/cmd-action/cmd-attack.c
@@ -12,6 +12,7 @@
 #include "dungeon/dungeon.h"
 #include "effect/effect-characteristics.h"
 #include "main/sound-definitions-table.h"
+#include "main/sound-of-music.h"
 #include "monster-race/race-flags1.h"
 #include "monster-race/race-flags2.h"
 #include "monster-race/race-flags3.h"

diff --git a/src/cmd-action/cmd-hissatsu.c b/src/cmd-action/cmd-hissatsu.c
index b2f7c71..ac045e0 100644 (file)
--- a/src/cmd-action/cmd-hissatsu.c
+++ b/src/cmd-action/cmd-hissatsu.c
@@ -17,6 +17,7 @@
 #include "game-option/text-display-options.h"
 #include "inventory/player-inventory.h"
 #include "main/sound-definitions-table.h"
+#include "main/sound-of-music.h"
 #include "monster-race/monster-race-hook.h"
 #include "object/item-use-flags.h"
 #include "player/player-effects.h"
@@ -24,7 +25,6 @@
 #include "spell/spells-execution.h"
 #include "spell/spells-util.h"
 #include "spell/technic-info-table.h"
-#include "util/util.h"
 #include "view/display-main-window.h"
 
 #define TECHNIC_HISSATSU (REALM_HISSATSU - MIN_TECHNIC)

diff --git a/src/cmd-action/cmd-mane.c b/src/cmd-action/cmd-mane.c
index 9a7a039..a273fd1 100644 (file)
--- a/src/cmd-action/cmd-mane.c
+++ b/src/cmd-action/cmd-mane.c
@@ -19,6 +19,7 @@
 #include "grid/grid.h"
 #include "io/targeting.h"
 #include "main/sound-definitions-table.h"
+#include "main/sound-of-music.h"
 #include "monster-race/race-flags1.h"
 #include "monster-race/race-flags-resistance.h"
 #include "monster/monster-describer.h"
@@ -39,7 +40,6 @@
 #include "spell/spells-summon.h"
 #include "spell-kind/spells-teleport.h"
 #include "spell/spell-types.h"
-#include "util/util.h"
 #include "view/display-main-window.h"
 
 static int damage;

diff --git a/src/cmd-action/cmd-pet.c b/src/cmd-action/cmd-pet.c
index b3c099e..1afa37c 100644 (file)
--- a/src/cmd-action/cmd-pet.c
+++ b/src/cmd-action/cmd-pet.c
@@ -12,6 +12,7 @@
 #include "grid/grid.h"
 #include "io/targeting.h"
 #include "io/write-diary.h"
+#include "main/sound-of-music.h"
 #include "monster-race/race-flags1.h"
 #include "monster-race/race-flags7.h"
 #include "monster/monster-describer.h"
@@ -29,7 +30,6 @@
 #include "player/player-move.h"
 #include "player/player-skill.h"
 #include "player/player-status.h"
-#include "util/util.h"
 #include "view/display-main-window.h"
 #include "world/world.h"
 

diff --git a/src/cmd-action/cmd-spell.c b/src/cmd-action/cmd-spell.c
index a89b1e0..1b2ccb4 100644 (file)
--- a/src/cmd-action/cmd-spell.c
+++ b/src/cmd-action/cmd-spell.c
@@ -18,6 +18,7 @@
 #include "io/write-diary.h"
 #include "locale/japanese.h"
 #include "main/sound-definitions-table.h"
+#include "main/sound-of-music.h"
 #include "mind/mind.h"
 #include "object/item-use-flags.h"
 #include "object/object-hook.h"
@@ -39,7 +40,6 @@
 #include "spell/spells-util.h"
 #include "spell/spells3.h"
 #include "spell/technic-info-table.h"
-#include "util/util.h"
 #include "view/display-main-window.h"
 
  /*!

diff --git a/src/cmd-building/cmd-building.c b/src/cmd-building/cmd-building.c
index d252b8a..3517ddb 100644 (file)
--- a/src/cmd-building/cmd-building.c
+++ b/src/cmd-building/cmd-building.c
@@ -26,6 +26,7 @@
 #include "floor/wild.h"
 #include "io/files-util.h"
 #include "main/music-definitions-table.h"
+#include "main/sound-of-music.h"
 #include "market/arena.h"
 #include "market/bounty.h"
 #include "market/building-actions-table.h"
@@ -51,7 +52,6 @@
 #include "spell-kind/spells-teleport.h"
 #include "spell/spells3.h"
 #include "system/building-type-definition.h"
-#include "util/util.h"
 #include "world/world.h"
 
 MONRACE_IDX battle_mon[4];

diff --git a/src/cmd-io/cmd-diary.c b/src/cmd-io/cmd-diary.c
index e0b466b..feef141 100644 (file)
--- a/src/cmd-io/cmd-diary.c
+++ b/src/cmd-io/cmd-diary.c
@@ -2,6 +2,7 @@
 #include "cmd-io/diary-subtitle-table.h"
 #include "core/show-file.h"
 #include "game-option/play-record-options.h"
+#include "main/sound-of-music.h"
 #include "io/chuukei.h"
 #include "io/files-util.h"
 #include "io/write-diary.h"

diff --git a/src/cmd-io/cmd-dump.c b/src/cmd-io/cmd-dump.c
index d5b90f7..bb4aae5 100644 (file)
--- a/src/cmd-io/cmd-dump.c
+++ b/src/cmd-io/cmd-dump.c
@@ -41,6 +41,7 @@
 #include "io/chuukei.h"
 #include "io/interpret-pref-file.h"
 #include "io/read-pref-file.h"
+#include "main/sound-of-music.h"
 #include "locale/english.h"
 #include "player/player-personalities-types.h"
 #include "system/angband-version.h"

diff --git a/src/cmd-io/cmd-gameoption.c b/src/cmd-io/cmd-gameoption.c
index 63fbf83..f8d5827 100644 (file)
--- a/src/cmd-io/cmd-gameoption.c
+++ b/src/cmd-io/cmd-gameoption.c
@@ -9,6 +9,7 @@
 #include "game-option/special-options.h"
 #include "io/files-util.h"
 #include "io/write-diary.h"
+#include "main/sound-of-music.h"
 #include "system/game-option-types.h"
 #include "term/gameterm.h"
 #include "term/term-color-types.h"

diff --git a/src/cmd-io/cmd-knowledge.c b/src/cmd-io/cmd-knowledge.c
index 3099f41..e7b98fe 100644 (file)
--- a/src/cmd-io/cmd-knowledge.c
+++ b/src/cmd-io/cmd-knowledge.c
@@ -12,6 +12,7 @@
 #include "knowledge/knowledge-quests.h"
 #include "knowledge/knowledge-self.h"
 #include "knowledge/knowledge-uniques.h"
+#include "main/sound-of-music.h"
 
 /*
  * Interact with "knowledge"

diff --git a/src/cmd-io/cmd-macro.c b/src/cmd-io/cmd-macro.c
index 12aa97c..b824e1c 100644 (file)
--- a/src/cmd-io/cmd-macro.c
+++ b/src/cmd-io/cmd-macro.c
@@ -4,6 +4,7 @@
 #include "game-option/input-options.h"
 #include "io/files-util.h"
 #include "io/read-pref-file.h"
+#include "main/sound-of-music.h"
 #include "term/term-color-types.h"
 #include "util/angband-files.h"
 #include "util/string-processor.h"

diff --git a/src/cmd-item/cmd-activate.c b/src/cmd-item/cmd-activate.c
index 805659c..c317aa1 100644 (file)
--- a/src/cmd-item/cmd-activate.c
+++ b/src/cmd-item/cmd-activate.c
@@ -22,6 +22,7 @@
 #include "io/files-util.h"
 #include "io/targeting.h"
 #include "main/sound-definitions-table.h"
+#include "main/sound-of-music.h"
 #include "monster-floor/monster-generator.h"
 #include "monster-floor/monster-summon.h"
 #include "monster-race/race-flags1.h"

diff --git a/src/cmd-item/cmd-eat.c b/src/cmd-item/cmd-eat.c
index 21c241b..52b101f 100644 (file)
--- a/src/cmd-item/cmd-eat.c
+++ b/src/cmd-item/cmd-eat.c
@@ -10,6 +10,7 @@
 #include "inventory/inventory-object.h"
 #include "inventory/player-inventory.h"
 #include "main/sound-definitions-table.h"
+#include "main/sound-of-music.h"
 #include "object-enchant/special-object-flags.h"
 #include "object/item-use-flags.h"
 #include "object/object-flavor.h"
@@ -30,7 +31,6 @@
 #include "spell/spells-status.h"
 #include "sv-definition/sv-food-types.h"
 #include "sv-definition/sv-other-types.h"
-#include "util/util.h"
 #include "view/display-main-window.h"
 #include "view/object-describer.h"
 

diff --git a/src/cmd-item/cmd-item.c b/src/cmd-item/cmd-item.c
index 6e28afb..1c1fd7a 100644 (file)
--- a/src/cmd-item/cmd-item.c
+++ b/src/cmd-item/cmd-item.c
@@ -31,6 +31,7 @@
 #include "inventory/player-inventory.h"
 #include "io/targeting.h"
 #include "main/sound-definitions-table.h"
+#include "main/sound-of-music.h"
 #include "mind/snipe-types.h"
 #include "object-enchant/item-feeling.h"
 #include "object-enchant/object-ego.h"
@@ -56,7 +57,6 @@
 #include "realm/realm-hex-numbers.h"
 #include "spell/spells3.h"
 #include "sv-definition/sv-lite-types.h"
-#include "util/util.h"
 #include "view/display-main-window.h"
 
 /*!

diff --git a/src/cmd-item/cmd-magiceat.c b/src/cmd-item/cmd-magiceat.c
index f367189..f902286 100644 (file)
--- a/src/cmd-item/cmd-magiceat.c
+++ b/src/cmd-item/cmd-magiceat.c
@@ -60,6 +60,7 @@
 #include "game-option/text-display-options.h"
 #include "io/targeting.h"
 #include "main/sound-definitions-table.h"
+#include "main/sound-of-music.h"
 #include "object/object-kind-hook.h"
 #include "object/object-kind.h"
 #include "sv-definition/sv-other-types.h"
@@ -69,7 +70,6 @@
 #include "player/player-status.h"
 #include "spell/spells3.h"
 #include "term/term-color-types.h"
-#include "util/util.h"
 
 /*!
  * @brief 魔道具術師の取り込んだ魔力一覧から選択/閲覧する /

diff --git a/src/cmd-item/cmd-quaff.c b/src/cmd-item/cmd-quaff.c
index ccd2204..6b941b7 100644 (file)
--- a/src/cmd-item/cmd-quaff.c
+++ b/src/cmd-item/cmd-quaff.c
@@ -13,6 +13,7 @@
 #include "inventory/inventory-object.h"
 #include "inventory/player-inventory.h"
 #include "main/sound-definitions-table.h"
+#include "main/sound-of-music.h"
 #include "mutation/mutation.h"
 #include "object/item-use-flags.h"
 #include "perception/object-perception.h"
@@ -37,7 +38,6 @@
 #include "spell-realm/spells-hex.h"
 #include "spell/spells-status.h"
 #include "spell/spells3.h"
-#include "util/util.h"
 #include "view/display-main-window.h"
 
 /*!

diff --git a/src/cmd-item/cmd-read.c b/src/cmd-item/cmd-read.c
index 831314f..effa901 100644 (file)
--- a/src/cmd-item/cmd-read.c
+++ b/src/cmd-item/cmd-read.c
@@ -14,6 +14,7 @@
 #include "inventory/player-inventory.h"
 #include "io/files-util.h"
 #include "main/sound-definitions-table.h"
+#include "main/sound-of-music.h"
 #include "monster-floor/monster-summon.h"
 #include "monster-floor/place-monster-types.h"
 #include "object/item-use-flags.h"

diff --git a/src/cmd-item/cmd-smith.c b/src/cmd-item/cmd-smith.c
index 73cbeec..d07a3da 100644 (file)
--- a/src/cmd-item/cmd-smith.c
+++ b/src/cmd-item/cmd-smith.c
@@ -9,6 +9,7 @@
 #include "cmd/cmd-basic.h"
 #include "game-option/text-display-options.h"
 #include "inventory/player-inventory.h"
+#include "main/sound-of-music.h"
 #include "object-enchant/object-ego.h"
 #include "object-enchant/special-object-flags.h"
 #include "object-enchant/tr-types.h"
@@ -21,7 +22,6 @@
 #include "perception/object-perception.h"
 #include "player/player-status.h"
 #include "term/term-color-types.h"
-#include "util/util.h"
 #include "view/display-main-window.h"
 
 /*!

diff --git a/src/cmd-item/cmd-usestaff.c b/src/cmd-item/cmd-usestaff.c
index 04a975d..7879676 100644 (file)
--- a/src/cmd-item/cmd-usestaff.c
+++ b/src/cmd-item/cmd-usestaff.c
@@ -6,6 +6,7 @@
 #include "inventory/inventory-object.h"
 #include "inventory/player-inventory.h"
 #include "main/sound-definitions-table.h"
+#include "main/sound-of-music.h"
 #include "monster-floor/monster-summon.h"
 #include "monster-floor/place-monster-types.h"
 #include "object-enchant/special-object-flags.h"
@@ -33,7 +34,6 @@
 #include "spell/spells-summon.h"
 #include "spell/spells3.h"
 #include "sv-definition/sv-staff-types.h"
-#include "util/util.h"
 #include "view/display-main-window.h"
 #include "view/object-describer.h"
 

diff --git a/src/cmd-item/cmd-zaprod.c b/src/cmd-item/cmd-zaprod.c
index 0b4ab23..37ffa8b 100644 (file)
--- a/src/cmd-item/cmd-zaprod.c
+++ b/src/cmd-item/cmd-zaprod.c
@@ -5,6 +5,7 @@
 #include "inventory/player-inventory.h"
 #include "io/targeting.h"
 #include "main/sound-definitions-table.h"
+#include "main/sound-of-music.h"
 #include "object-enchant/special-object-flags.h"
 #include "object/item-use-flags.h"
 #include "object/object-hook.h"
@@ -30,7 +31,6 @@
 #include "spell/spells3.h"
 #include "sv-definition/sv-other-types.h"
 #include "sv-definition/sv-rod-types.h"
-#include "util/util.h"
 #include "view/display-main-window.h"
 
 /*!

diff --git a/src/cmd-item/cmd-zapwand.c b/src/cmd-item/cmd-zapwand.c
index 005abc2..c08cefd 100644 (file)
--- a/src/cmd-item/cmd-zapwand.c
+++ b/src/cmd-item/cmd-zapwand.c
@@ -7,6 +7,7 @@
 #include "inventory/player-inventory.h"
 #include "io/targeting.h"
 #include "main/sound-definitions-table.h"
+#include "main/sound-of-music.h"
 #include "object-enchant/special-object-flags.h"
 #include "object/item-use-flags.h"
 #include "object/object-hook.h"
@@ -27,7 +28,6 @@
 #include "spell/spells-status.h"
 #include "spell/spell-types.h"
 #include "sv-definition/sv-wand-types.h"
-#include "util/util.h"
 #include "view/display-main-window.h"
 #include "view/object-describer.h"
 

diff --git a/src/cmd/cmd-basic.c b/src/cmd/cmd-basic.c
index dff584f..29e6c59 100644 (file)
--- a/src/cmd/cmd-basic.c
+++ b/src/cmd/cmd-basic.c
@@ -42,6 +42,7 @@
 #include "io/write-diary.h"
 #include "main/music-definitions-table.h"
 #include "main/sound-definitions-table.h"
+#include "main/sound-of-music.h"
 #include "mind/snipe-types.h"
 #include "monster/monster-describer.h"
 #include "monster-floor/monster-death.h"

diff --git a/src/cmd/cmd-draw.c b/src/cmd/cmd-draw.c
index 399e458..e553429 100644 (file)
--- a/src/cmd/cmd-draw.c
+++ b/src/cmd/cmd-draw.c
@@ -1,6 +1,7 @@
 #include "cmd/cmd-draw.h"
 #include "core/stuff-handler.h"
 #include "io/files-util.h"
+#include "main/sound-of-music.h"
 #include "player/player-effects.h"
 #include "player/player-race-types.h"
 #include "player/process-name.h"

diff --git a/src/cmd/cmd-visuals.c b/src/cmd/cmd-visuals.c
index 525c7c1..4b6ef36 100644 (file)
--- a/src/cmd/cmd-visuals.c
+++ b/src/cmd/cmd-visuals.c
@@ -8,6 +8,7 @@
 #include "knowledge/knowledge-items.h"
 #include "knowledge/knowledge-monsters.h"
 #include "knowledge/lighting-level-table.h"
+#include "main/sound-of-music.h"
 #include "object/object-flavor.h"
 #include "object/object-generator.h"
 #include "object/object-kind.h"

diff --git a/src/combat/attack-accuracy.c b/src/combat/attack-accuracy.c
index 69dc206..f4d10f2 100644 (file)
--- a/src/combat/attack-accuracy.c
+++ b/src/combat/attack-accuracy.c
@@ -1,5 +1,6 @@
 #include "combat/attack-accuracy.h"
 #include "main/sound-definitions-table.h"
+#include "main/sound-of-music.h"
 #include "monster-race/race-flags-resistance.h"
 #include "specific-object/death-scythe.h"
 #include "sv-definition/sv-weapon-types.h"

diff --git a/src/combat/shoot.c b/src/combat/shoot.c
index 46168a0..c691756 100644 (file)
--- a/src/combat/shoot.c
+++ b/src/combat/shoot.c
@@ -10,6 +10,7 @@
 #include "inventory/inventory-object.h"
 #include "io/targeting.h"
 #include "main/sound-definitions-table.h"
+#include "main/sound-of-music.h"
 #include "mind/snipe-types.h"
 #include "monster-race/race-flags-resistance.h"
 #include "monster-race/race-flags1.h"
@@ -42,7 +43,6 @@
 #include "spell/process-effect.h"
 #include "spell/spell-types.h"
 #include "sv-definition/sv-bow-types.h"
-#include "util/util.h"
 #include "view/display-main-window.h"
 #include "world/world-object.h"
 

diff --git a/src/core/game-closer.c b/src/core/game-closer.c
index 66b8c06..9e9e4ed 100644 (file)
--- a/src/core/game-closer.c
+++ b/src/core/game-closer.c
@@ -5,6 +5,7 @@
 #include "io/signal-handlers.h"
 #include "io/uid-checker.h"
 #include "main/music-definitions-table.h"
+#include "main/sound-of-music.h"
 #include "player/process-death.h"
 #include "io/save.h"
 #include "core/scores.h"

diff --git a/src/core/game-play.c b/src/core/game-play.c
index 7259113..1a82f11 100644 (file)
--- a/src/core/game-play.c
+++ b/src/core/game-play.c
@@ -19,6 +19,7 @@
 #include "core/output-updater.h"
 #include "core/player-processor.h"
 #include "core/scores.h"
+#include "core/speed-table.h"
 #include "core/stuff-handler.h"
 #include "core/visuals-reseter.h"
 #include "dungeon/dungeon-processor.h"
@@ -41,14 +42,14 @@
 #include "io/signal-handlers.h"
 #include "io/targeting.h"
 #include "io/write-diary.h"
+#include "main/sound-of-music.h"
 #include "market/arena-info-table.h"
 #include "market/bounty.h"
-#include "monster-race/race-indice-types.h"
-#include "core/speed-table.h"
 #include "monster-floor/monster-generator.h"
 #include "monster-floor/monster-remover.h"
-#include "monster/monster-util.h"
 #include "monster-floor/place-monster-types.h"
+#include "monster-race/race-indice-types.h"
+#include "monster/monster-util.h"
 #include "object/object-flavor.h"
 #include "player/player-class.h"
 #include "player/player-effects.h"

diff --git a/src/core/show-file.c b/src/core/show-file.c
index 8d30393..e7f4594 100644 (file)
--- a/src/core/show-file.c
+++ b/src/core/show-file.c
@@ -1,5 +1,6 @@
 #include "core/show-file.h"
 #include "io/files-util.h"
+#include "main/sound-of-music.h"
 #include "system/angband-version.h"
 #include "term/gameterm.h"
 #include "term/term-color-types.h"

diff --git a/src/dungeon/dungeon.c b/src/dungeon/dungeon.c
index 8a310a0..2c00358 100644 (file)
--- a/src/dungeon/dungeon.c
+++ b/src/dungeon/dungeon.c
@@ -1,5 +1,6 @@
 #include "dungeon/dungeon.h"
 #include "game-option/birth-options.h"
+#include "main/sound-of-music.h"
 #include "world/world.h"
 
 /*

diff --git a/src/dungeon/quest.c b/src/dungeon/quest.c
index 2aab1fe..6084513 100644 (file)
--- a/src/dungeon/quest.c
+++ b/src/dungeon/quest.c
@@ -12,6 +12,7 @@
 #include "io/write-diary.h"
 #include "locale/english.h"
 #include "main/music-definitions-table.h"
+#include "main/sound-of-music.h"
 #include "monster-race/monster-race-hook.h"
 #include "monster-race/race-flags1.h"
 #include "monster-race/race-flags7.h"
@@ -27,7 +28,6 @@
 #include "player/player-personalities-types.h"
 #include "player/player-status.h"
 #include "system/system-variables.h"
-#include "util/util.h"
 #include "view/display-main-window.h"
 #include "world/world.h"
 

diff --git a/src/effect/effect-feature.c b/src/effect/effect-feature.c
index 4e8122e..52e7bc1 100644 (file)
--- a/src/effect/effect-feature.c
+++ b/src/effect/effect-feature.c
@@ -5,6 +5,7 @@
 #include "grid/grid.h"
 #include "grid/trap.h"
 #include "main/sound-definitions-table.h"
+#include "main/sound-of-music.h"
 #include "monster/monster-update.h"
 #include "player/player-effects.h"
 #include "room/rooms.h"

diff --git a/src/effect/effect-monster.c b/src/effect/effect-monster.c
index 1ebf46c..627b70a 100644 (file)
--- a/src/effect/effect-monster.c
+++ b/src/effect/effect-monster.c
@@ -12,6 +12,7 @@
 #include "game-option/play-record-options.h"
 #include "io/write-diary.h"
 #include "main/sound-definitions-table.h"
+#include "main/sound-of-music.h"
 #include "monster-race/race-indice-types.h"
 #include "monster-race/race-flags-resistance.h"
 #include "monster-race/race-flags1.h"

diff --git a/src/effect/effect-player.c b/src/effect/effect-player.c
index 4fc9ae9..473acdb 100644 (file)
--- a/src/effect/effect-player.c
+++ b/src/effect/effect-player.c
@@ -10,6 +10,7 @@
 #include "effect/effect-player-util.h"
 #include "effect/spells-effect-util.h"
 #include "main/sound-definitions-table.h"
+#include "main/sound-of-music.h"
 #include "mind/mind-ninja.h"
 #include "monster/monster-describer.h"
 #include "monster/monster-description-types.h"

diff --git a/src/floor/floor-events.c b/src/floor/floor-events.c
index 1080bd9..707cf06 100644 (file)
--- a/src/floor/floor-events.c
+++ b/src/floor/floor-events.c
@@ -8,6 +8,7 @@
 #include "game-option/disturbance-options.h"
 #include "game-option/map-screen-options.h"
 #include "grid/grid.h"
+#include "main/sound-of-music.h"
 #include "monster-race/race-flags1.h"
 #include "monster-race/race-flags7.h"
 #include "monster/monster-info.h"
@@ -25,7 +26,6 @@
 #include "sv-definition/sv-ring-types.h"
 #include "player/player-effects.h"
 #include "player/player-move.h"
-#include "util/util.h"
 #include "view/display-main-window.h"
 #include "world/world.h"
 

diff --git a/src/floor/floor-object.c b/src/floor/floor-object.c
index 714df69..51d7913 100644 (file)
--- a/src/floor/floor-object.c
+++ b/src/floor/floor-object.c
@@ -9,6 +9,7 @@
 #include "game-option/birth-options.h"
 #include "game-option/cheat-options.h"
 #include "main/sound-definitions-table.h"
+#include "main/sound-of-music.h"
 #include "object-enchant/apply-magic.h"
 #include "object-enchant/artifact.h"
 #include "object-enchant/item-apply-magic.h"

diff --git a/src/floor/floor-save.c b/src/floor/floor-save.c
index 76ae9e3..c7d47d9 100644 (file)
--- a/src/floor/floor-save.c
+++ b/src/floor/floor-save.c
@@ -30,6 +30,7 @@
 #include "io/save.h"
 #include "io/uid-checker.h"
 #include "io/write-diary.h"
+#include "main/sound-of-music.h"
 #include "mind/mind-mirror-master.h"
 #include "monster-floor/monster-generator.h"
 #include "monster-floor/monster-remover.h"

diff --git a/src/grid/trap.c b/src/grid/trap.c
index e6d8e11..3605dff 100644 (file)
--- a/src/grid/trap.c
+++ b/src/grid/trap.c
@@ -14,6 +14,7 @@
 #include "io/files-util.h"
 #include "io/write-diary.h"
 #include "main/sound-definitions-table.h"
+#include "main/sound-of-music.h"
 #include "mind/mind-mirror-master.h"
 #include "monster-floor/monster-summon.h"
 #include "monster-floor/place-monster-types.h"
@@ -32,7 +33,6 @@
 #include "spell/process-effect.h"
 #include "spell/spells-summon.h"
 #include "spell/spell-types.h"
-#include "util/util.h"
 #include "world/world.h"
 
 static s16b normal_traps[MAX_NORMAL_TRAPS];

diff --git a/src/inventory/player-inventory.c b/src/inventory/player-inventory.c
index c751af6..59f40b9 100644 (file)
--- a/src/inventory/player-inventory.c
+++ b/src/inventory/player-inventory.c
@@ -8,6 +8,7 @@
 #include "game-option/special-options.h"
 #include "game-option/text-display-options.h"
 #include "inventory/inventory-object.h"
+#include "main/sound-of-music.h"
 #include "object/item-use-flags.h"
 #include "object/object-flavor.h"
 #include "object/object-hook.h"
@@ -18,7 +19,6 @@
 #include "player/player-move.h"
 #include "term/gameterm.h"
 #include "term/term-color-types.h"
-#include "util/util.h"
 #include "view/display-main-window.h"
 
 bool select_ring_slot;

diff --git a/src/io/input-key-processor.c b/src/io/input-key-processor.c
index 946c3ed..506934f 100644 (file)
--- a/src/io/input-key-processor.c
+++ b/src/io/input-key-processor.c
@@ -51,6 +51,7 @@
 #include "knowledge/knowledge-autopick.h"
 #include "knowledge/knowledge-quests.h"
 #include "main/sound-definitions-table.h"
+#include "main/sound-of-music.h"
 #include "mind/mind-sniper.h"
 #include "mind/mind.h" // do_cmd_mind_browse() がある。後で移設する.
 #include "mind/racial.h" // do_cmd_racial_power() がある。ファイル名変更？.

diff --git a/src/io/targeting.c b/src/io/targeting.c
index 5a73ef4..80d53b1 100644 (file)
--- a/src/io/targeting.c
+++ b/src/io/targeting.c
@@ -30,6 +30,7 @@
 #include "grid/feature.h"
 #include "grid/grid.h"
 #include "inventory/player-inventory.h"
+#include "main/sound-of-music.h"
 #include "monster-race/race-flags1.h"
 #include "monster-race/monster-race-hook.h"
 #include "monster/monster-describer.h"

diff --git a/src/main-gcu.c b/src/main-gcu.c
index 58996a0..5ffb442 100644 (file)
--- a/src/main-gcu.c
+++ b/src/main-gcu.c
@@ -162,6 +162,7 @@
 #include "io/exit-panic.h"
 #include "io/files-util.h"
 #include "main/sound-definitions-table.h"
+#include "main/sound-of-music.h"
 #include "term/gameterm.h"
 #include "term/term-color-types.h"
 

diff --git a/src/main-win.c b/src/main-win.c
index 3d9be89..303da7c 100644 (file)
--- a/src/main-win.c
+++ b/src/main-win.c
@@ -111,6 +111,7 @@
 #include "main/init.h"
 #include "main/music-definitions-table.h"
 #include "main/sound-definitions-table.h"
+#include "main/sound-of-music.h"
 #include "system/angband-version.h"
 #include "system/angband.h"
 #include "system/system-variables.h"

diff --git a/src/main-x11.c b/src/main-x11.c
index fc41d20..848b9df 100644 (file)
--- a/src/main-x11.c
+++ b/src/main-x11.c
@@ -98,6 +98,7 @@
 #include "game-option/special-options.h"
 #include "io/files-util.h"
 #include "main/sound-definitions-table.h"
+#include "main/sound-of-music.h"
 #include "system/system-variables.h"
 #include "term/gameterm.h"
 #include "term/term-color-types.h"

diff --git a/src/main/sound-of-music.c b/src/main/sound-of-music.c
new file mode 100644 (file)
index 0000000..d45ca14
--- /dev/null
+++ b/src/main/sound-of-music.c
@@ -0,0 +1,123 @@
+#include "main/sound-of-music.h"
+#include "floor/floor.h"
+#include "game-option/disturbance-options.h"
+#include "game-option/special-options.h"
+#include "main/music-definitions-table.h"
+
+/*
+ * Flush the screen, make a noise
+ */
+void bell(void)
+{
+    Term_fresh();
+    if (ring_bell)
+        Term_xtra(TERM_XTRA_NOISE, 0);
+
+    flush();
+}
+
+/*
+ * todo intをsound_typeに差し替える
+ * @brief 音を鳴らす
+ */
+void sound(int val)
+{
+    if (!use_sound)
+        return;
+
+    Term_xtra(TERM_XTRA_SOUND, val);
+}
+
+/*
+ * Hack -- Play a music
+ */
+errr play_music(int type, int val)
+{
+    if (!use_music)
+        return 1;
+
+    return Term_xtra(type, val);
+}
+
+/*
+ * Hack -- Select floor music.
+ */
+void select_floor_music(player_type *player_ptr)
+{
+    if (!use_music)
+        return;
+
+    if (player_ptr->ambush_flag) {
+        if (!play_music(TERM_XTRA_MUSIC_BASIC, MUSIC_BASIC_AMBUSH))
+            return;
+    }
+
+    if (player_ptr->wild_mode) {
+        if (!play_music(TERM_XTRA_MUSIC_BASIC, MUSIC_BASIC_WILD))
+            return;
+    }
+
+    if (player_ptr->current_floor_ptr->inside_arena) {
+        if (!play_music(TERM_XTRA_MUSIC_BASIC, MUSIC_BASIC_ARENA))
+            return;
+    }
+
+    if (player_ptr->phase_out) {
+        if (!play_music(TERM_XTRA_MUSIC_BASIC, MUSIC_BASIC_BATTLE))
+            return;
+    }
+
+    if (player_ptr->current_floor_ptr->inside_quest) {
+        if (!play_music(TERM_XTRA_MUSIC_QUEST, player_ptr->current_floor_ptr->inside_quest))
+            return;
+        if (!play_music(TERM_XTRA_MUSIC_BASIC, MUSIC_BASIC_QUEST))
+            return;
+    }
+
+    if (player_ptr->dungeon_idx) {
+        if (player_ptr->feeling == 2) {
+            if (!play_music(TERM_XTRA_MUSIC_BASIC, MUSIC_BASIC_DUN_FEEL2))
+                return;
+        } else if (player_ptr->feeling >= 3 && player_ptr->feeling <= 5) {
+            if (!play_music(TERM_XTRA_MUSIC_BASIC, MUSIC_BASIC_DUN_FEEL1))
+                return;
+        } else {
+            if (!play_music(TERM_XTRA_MUSIC_DUNGEON, player_ptr->dungeon_idx))
+                return;
+
+            if (player_ptr->current_floor_ptr->dun_level < 40) {
+                if (!play_music(TERM_XTRA_MUSIC_BASIC, MUSIC_BASIC_DUN_LOW))
+                    return;
+            } else if (player_ptr->current_floor_ptr->dun_level < 80) {
+                if (!play_music(TERM_XTRA_MUSIC_BASIC, MUSIC_BASIC_DUN_MED))
+                    return;
+            } else {
+                if (!play_music(TERM_XTRA_MUSIC_BASIC, MUSIC_BASIC_DUN_HIGH))
+                    return;
+            }
+        }
+    }
+
+    if (player_ptr->town_num) {
+        if (!play_music(TERM_XTRA_MUSIC_TOWN, player_ptr->town_num))
+            return;
+        if (!play_music(TERM_XTRA_MUSIC_BASIC, MUSIC_BASIC_TOWN))
+            return;
+        return;
+    }
+
+    if (!player_ptr->current_floor_ptr->dun_level) {
+        if (player_ptr->lev >= 45) {
+            if (!play_music(TERM_XTRA_MUSIC_BASIC, MUSIC_BASIC_FIELD3))
+                return;
+        } else if (player_ptr->lev >= 25) {
+            if (!play_music(TERM_XTRA_MUSIC_BASIC, MUSIC_BASIC_FIELD2))
+                return;
+        } else {
+            if (!play_music(TERM_XTRA_MUSIC_BASIC, MUSIC_BASIC_FIELD1))
+                return;
+        }
+    }
+
+    play_music(TERM_XTRA_MUSIC_MUTE, 0);
+}

diff --git a/src/main/sound-of-music.h b/src/main/sound-of-music.h
new file mode 100644 (file)
index 0000000..1687b9b
--- /dev/null
+++ b/src/main/sound-of-music.h
@@ -0,0 +1,8 @@
+#pragma once
+
+#include "system/angband.h"
+
+void bell(void);
+void sound(int num);
+errr play_music(int type, int num);
+void select_floor_music(player_type *player_ptr);

diff --git a/src/market/arena.c b/src/market/arena.c
index d601e4f..d2b8724 100644 (file)
--- a/src/market/arena.c
+++ b/src/market/arena.c
@@ -3,6 +3,7 @@
 #include "core/stuff-handler.h"
 #include "dungeon/dungeon.h"
 #include "floor/floor.h"
+#include "main/sound-of-music.h"
 #include "market/arena-info-table.h"
 #include "market/building-actions-table.h"
 #include "market/building-util.h"

diff --git a/src/melee/melee-postprocess.c b/src/melee/melee-postprocess.c
index 1e4c673..8251bb9 100644 (file)
--- a/src/melee/melee-postprocess.c
+++ b/src/melee/melee-postprocess.c
@@ -15,6 +15,7 @@
 #include "floor/floor.h"
 #include "grid/grid.h"
 #include "main/sound-definitions-table.h"
+#include "main/sound-of-music.h"
 #include "monster-race/race-flags-resistance.h"
 #include "monster-race/race-flags1.h"
 #include "monster-race/race-flags3.h"
@@ -33,7 +34,6 @@
 #include "player/player-move.h"
 #include "player/player-personalities-types.h"
 #include "player/player-race-types.h"
-#include "util/util.h"
 
 // Melee-post-process-type
 typedef struct mam_pp_type {

diff --git a/src/melee/monster-attack-monster.c b/src/melee/monster-attack-monster.c
index a45e8c4..66ffba8 100644 (file)
--- a/src/melee/monster-attack-monster.c
+++ b/src/melee/monster-attack-monster.c
@@ -10,6 +10,7 @@
 #include "dungeon/dungeon.h"
 #include "effect/effect-characteristics.h"
 #include "main/sound-definitions-table.h"
+#include "main/sound-of-music.h"
 #include "melee/melee-postprocess.h"
 #include "melee/melee-switcher.h"
 #include "melee/melee-util.h"

diff --git a/src/mind/mind-sniper.c b/src/mind/mind-sniper.c
index b192b42..91860e7 100644 (file)
--- a/src/mind/mind-sniper.c
+++ b/src/mind/mind-sniper.c
@@ -12,13 +12,13 @@
 #include "floor/floor.h"
 #include "game-option/text-display-options.h"
 #include "main/sound-definitions-table.h"
+#include "main/sound-of-music.h"
 #include "mind/snipe-types.h"
 #include "monster-race/race-flags-resistance.h"
 #include "monster-race/race-flags3.h"
 #include "monster-race/monster-race.h"
 #include "player/player-status.h"
 #include "term/term-color-types.h"
-#include "util/util.h"
 #include "view/display-main-window.h"
 
 #define MAX_SNIPE_POWERS 16

diff --git a/src/mind/mind.c b/src/mind/mind.c
index 8a619eb..4a08c3c 100644 (file)
--- a/src/mind/mind.c
+++ b/src/mind/mind.c
@@ -28,6 +28,7 @@
 #include "grid/grid.h"
 #include "io/targeting.h"
 #include "main/sound-definitions-table.h"
+#include "main/sound-of-music.h"
 #include "mind/mind-force-trainer.h"
 #include "mind/mind-mindcrafter.h"
 #include "mind/mind-mirror-master.h"
@@ -56,7 +57,6 @@
 #include "spell-kind/spells-teleport.h"
 #include "spell/spell-types.h"
 #include "spell/spells3.h"
-#include "util/util.h"
 #include "view/display-main-window.h"
 
 /*! 特殊技能の一覧テーブル */

diff --git a/src/mind/monk-attack.c b/src/mind/monk-attack.c
index b305826..3ea0def 100644 (file)
--- a/src/mind/monk-attack.c
+++ b/src/mind/monk-attack.c
@@ -13,6 +13,7 @@
 #include "game-option/cheat-options.h"
 #include "io/targeting.h"
 #include "main/sound-definitions-table.h"
+#include "main/sound-of-music.h"
 #include "mind/mind-force-trainer.h"
 #include "monster-race/race-flags1.h"
 #include "monster-race/race-flags3.h"

diff --git a/src/mind/racial.c b/src/mind/racial.c
index 641d3a0..6a0f722 100644 (file)
--- a/src/mind/racial.c
+++ b/src/mind/racial.c
@@ -21,6 +21,7 @@
 #include "game-option/disturbance-options.h"
 #include "game-option/text-display-options.h"
 #include "io/targeting.h"
+#include "main/sound-of-music.h"
 #include "melee/melee-postprocess.h"
 #include "mind/mind-cavalry.h"
 #include "mind/mind-force-trainer.h"
@@ -53,7 +54,6 @@
 #include "spell/spells-status.h"
 #include "spell/spell-types.h"
 #include "spell/spells3.h"
-#include "util/util.h"
 #include "view/display-main-window.h"
 
 /*!

diff --git a/src/monster-attack/monster-attack-describer.c b/src/monster-attack/monster-attack-describer.c
index 75c3f7c..f9c7344 100644 (file)
--- a/src/monster-attack/monster-attack-describer.c
+++ b/src/monster-attack/monster-attack-describer.c
@@ -5,9 +5,10 @@
  */
 
 #include "monster-attack/monster-attack-describer.h"
+#include "main/sound-definitions-table.h"
+#include "main/sound-of-music.h"
 #include "monster-attack/insults-moans.h"
 #include "monster-race/race-indice-types.h"
-#include "main/sound-definitions-table.h"
 
 static void show_jaian_song(monap_type *monap_ptr)
 {

diff --git a/src/monster-attack/monster-attack-player.c b/src/monster-attack/monster-attack-player.c
index 6198802..e23a241 100644 (file)
--- a/src/monster-attack/monster-attack-player.c
+++ b/src/monster-attack/monster-attack-player.c
@@ -15,6 +15,7 @@
 #include "dungeon/dungeon.h"
 #include "effect/effect-characteristics.h"
 #include "main/sound-definitions-table.h"
+#include "main/sound-of-music.h"
 #include "mind/mind-ninja.h"
 #include "mind/mind-samurai.h"
 #include "monster-attack/monster-attack-describer.h"

diff --git a/src/monster-floor/monster-death.c b/src/monster-floor/monster-death.c
index cb54517..0dd2b51 100644 (file)
--- a/src/monster-floor/monster-death.c
+++ b/src/monster-floor/monster-death.c
@@ -14,6 +14,7 @@
 #include "io/write-diary.h"
 #include "lore/lore-store.h"
 #include "main/music-definitions-table.h"
+#include "main/sound-of-music.h"
 #include "market/arena-info-table.h"
 #include "monster-floor/monster-object.h"
 #include "monster-floor/monster-summon.h"

diff --git a/src/monster-floor/monster-summon.c b/src/monster-floor/monster-summon.c
index e27e07e..6e4d876 100644 (file)
--- a/src/monster-floor/monster-summon.c
+++ b/src/monster-floor/monster-summon.c
@@ -2,6 +2,7 @@
 #include "dungeon/dungeon.h"
 #include "floor/floor.h"
 #include "main/sound-definitions-table.h"
+#include "main/sound-of-music.h"
 #include "monster-floor/monster-generator.h"
 #include "monster-floor/place-monster-types.h"
 #include "monster-race/monster-race-hook.h"

diff --git a/src/monster/monster-status.c b/src/monster/monster-status.c
index 78bc1b1..f1d56ca 100644 (file)
--- a/src/monster/monster-status.c
+++ b/src/monster/monster-status.c
@@ -15,6 +15,7 @@
 #include "io/report.h"
 #include "io/write-diary.h"
 #include "main/sound-definitions-table.h"
+#include "main/sound-of-music.h"
 #include "monster-attack/monster-attack-effect.h"
 #include "monster-attack/monster-attack-types.h"
 #include "monster-floor/monster-death.h"
@@ -48,7 +49,6 @@
 #include "player/player-personalities-types.h"
 #include "spell-kind/spells-random.h"
 #include "spell/spells-summon.h"
-#include "util/util.h"
 #include "view/display-main-window.h"
 #include "world/world.h"
 

diff --git a/src/mspell/mspell-ball.c b/src/mspell/mspell-ball.c
index 91c05f2..d0c9ea9 100644 (file)
--- a/src/mspell/mspell-ball.c
+++ b/src/mspell/mspell-ball.c
@@ -1,5 +1,6 @@
 #include "mspell/mspell-ball.h"
 #include "floor/floor.h"
+#include "main/sound-of-music.h"
 #include "mind/drs-types.h"
 #include "monster-race/race-indice-types.h"
 #include "monster/monster-info.h"

diff --git a/src/mspell/mspell-bolt.c b/src/mspell/mspell-bolt.c
index 27b2813..3cf34e7 100644 (file)
--- a/src/mspell/mspell-bolt.c
+++ b/src/mspell/mspell-bolt.c
@@ -1,5 +1,6 @@
 #include "mspell/mspell-bolt.h"
 #include "main/sound-definitions-table.h"
+#include "main/sound-of-music.h"
 #include "mind/drs-types.h"
 #include "monster/monster-info.h"
 #include "monster/monster-update.h"

diff --git a/src/mspell/mspell-breath.c b/src/mspell/mspell-breath.c
index 6403796..1025cd9 100644 (file)
--- a/src/mspell/mspell-breath.c
+++ b/src/mspell/mspell-breath.c
@@ -1,5 +1,6 @@
 #include "mspell/mspell-breath.h"
 #include "main/sound-definitions-table.h"
+#include "main/sound-of-music.h"
 #include "mind/drs-types.h"
 #include "monster-race/race-indice-types.h"
 #include "monster/monster-info.h"

diff --git a/src/mspell/mspell-special.c b/src/mspell/mspell-special.c
index ae128a6..da669c7 100644 (file)
--- a/src/mspell/mspell-special.c
+++ b/src/mspell/mspell-special.c
@@ -7,6 +7,7 @@
 #include "mspell/mspell-special.h"
 #include "effect/effect-characteristics.h"
 #include "main/sound-definitions-table.h"
+#include "main/sound-of-music.h"
 #include "melee/melee-postprocess.h"
 #include "monster-floor/monster-death.h"
 #include "monster-floor/monster-remover.h"

diff --git a/src/mspell/mspells3.c b/src/mspell/mspells3.c
index a32b7ec..50b7add 100644 (file)
--- a/src/mspell/mspells3.c
+++ b/src/mspell/mspells3.c
@@ -22,6 +22,7 @@
 #include "io/targeting.h"
 #include "lore/lore-calculator.h"
 #include "main/sound-definitions-table.h"
+#include "main/sound-of-music.h"
 #include "monster-floor/monster-summon.h"
 #include "monster-floor/place-monster-types.h"
 #include "monster-race/race-flags-ability1.h"
@@ -47,7 +48,6 @@
 #include "spell/spells-summon.h"
 #include "spell/spell-types.h"
 #include "spell/spells3.h"
-#include "util/util.h"
 #include "view/display-main-window.h"
 
  /*!

diff --git a/src/player-attack/player-attack.c b/src/player-attack/player-attack.c
index 139a3f2..b7f98c1 100644 (file)
--- a/src/player-attack/player-attack.c
+++ b/src/player-attack/player-attack.c
@@ -12,6 +12,7 @@
 #include "combat/slaying.h"
 #include "floor/floor.h"
 #include "main/sound-definitions-table.h"
+#include "main/sound-of-music.h"
 #include "mind/mind-ninja.h"
 #include "mind/mind-samurai.h"
 #include "mind/monk-attack.h"

diff --git a/src/player/player-damage.c b/src/player/player-damage.c
index c12ea44..05c5b77 100644 (file)
--- a/src/player/player-damage.c
+++ b/src/player/player-damage.c
@@ -19,6 +19,7 @@
 #include "io/write-diary.h"
 #include "main/music-definitions-table.h"
 #include "main/sound-definitions-table.h"
+#include "main/sound-of-music.h"
 #include "market/arena-info-table.h"
 #include "mind/mind-mirror-master.h"
 #include "monster/monster-describer.h"
@@ -41,7 +42,6 @@
 #include "player/player-status.h"
 #include "realm/realm-song-numbers.h"
 #include "term/term-color-types.h"
-#include "util/util.h"
 #include "view/display-main-window.h"
 #include "world/world.h"
 

diff --git a/src/player/player-move.c b/src/player/player-move.c
index f8eab04..1bf98ab 100644 (file)
--- a/src/player/player-move.c
+++ b/src/player/player-move.c
@@ -164,6 +164,7 @@
 #include "inventory/player-inventory.h"
 #include "io/targeting.h"
 #include "main/sound-definitions-table.h"
+#include "main/sound-of-music.h"
 #include "monster-race/race-flags-resistance.h"
 #include "monster-race/race-flags1.h"
 #include "monster-race/race-flags2.h"
@@ -191,7 +192,6 @@
 #include "spell/process-effect.h"
 #include "spell/spell-types.h"
 #include "spell/spells3.h"
-#include "util/util.h"
 #include "view/display-main-window.h"
 #include "world/world.h"
 

diff --git a/src/player/player-status.c b/src/player/player-status.c
index 812b2b5..f85a0fa 100644 (file)
--- a/src/player/player-status.c
+++ b/src/player/player-status.c
@@ -21,6 +21,7 @@
 #include "io/files-util.h"
 #include "io/write-diary.h"
 #include "main/sound-definitions-table.h"
+#include "main/sound-of-music.h"
 #include "market/arena-info-table.h"
 #include "mind/mind-force-trainer.h"
 #include "monster-race/race-flags1.h"
@@ -69,7 +70,6 @@
 #include "spell/technic-info-table.h"
 #include "sv-definition/sv-lite-types.h"
 #include "sv-definition/sv-weapon-types.h"
-#include "util/util.h"
 #include "view/display-main-window.h"
 #include "world/world.h"
 

diff --git a/src/specific-object/chest.c b/src/specific-object/chest.c
index 9dcd873..ebd022e 100644 (file)
--- a/src/specific-object/chest.c
+++ b/src/specific-object/chest.c
@@ -4,6 +4,7 @@
 #include "grid/grid.h"
 #include "grid/trap.h"
 #include "main/sound-definitions-table.h"
+#include "main/sound-of-music.h"
 #include "monster-floor/monster-summon.h"
 #include "monster-floor/place-monster-types.h"
 #include "object-enchant/item-apply-magic.h"
@@ -19,7 +20,6 @@
 #include "spell/spell-types.h"
 #include "spell/spells3.h"
 #include "sv-definition/sv-other-types.h"
-#include "util/util.h"
 
 /*!< この値以降の小項目IDを持った箱は大型の箱としてドロップ数を増やす / Special "sval" limit -- first "large" chest */
 #define SV_CHEST_MIN_LARGE 4

diff --git a/src/specific-object/death-scythe.c b/src/specific-object/death-scythe.c
index c2361e0..2de18ef 100644 (file)
--- a/src/specific-object/death-scythe.c
+++ b/src/specific-object/death-scythe.c
@@ -9,6 +9,7 @@
 #include "combat/attack-criticality.h"
 #include "core/stuff-handler.h"
 #include "main/sound-definitions-table.h"
+#include "main/sound-of-music.h"
 #include "object-enchant/tr-types.h"
 #include "object/object-flags.h"
 #include "player/player-damage.h"

diff --git a/src/spell-kind/spells-random.c b/src/spell-kind/spells-random.c
index bd44018..49f2eb0 100644 (file)
--- a/src/spell-kind/spells-random.c
+++ b/src/spell-kind/spells-random.c
@@ -9,6 +9,7 @@
 #include "floor/floor.h"
 #include "io/targeting.h"
 #include "main/sound-definitions-table.h"
+#include "main/sound-of-music.h"
 #include "monster-floor/monster-summon.h"
 #include "monster-floor/place-monster-types.h"
 #include "mutation/mutation.h"

diff --git a/src/spell-kind/spells-teleport.c b/src/spell-kind/spells-teleport.c
index 87ca75a..3dff8d7 100644 (file)
--- a/src/spell-kind/spells-teleport.c
+++ b/src/spell-kind/spells-teleport.c
@@ -17,6 +17,7 @@
 #include "io/targeting.h"
 #include "io/write-diary.h"
 #include "main/sound-definitions-table.h"
+#include "main/sound-of-music.h"
 #include "core/speed-table.h"
 #include "monster-race/race-flags-ability2.h"
 #include "monster-race/race-flags-resistance.h"

diff --git a/src/spell/process-effect.c b/src/spell/process-effect.c
index dcd2d26..39d97e7 100644 (file)
--- a/src/spell/process-effect.c
+++ b/src/spell/process-effect.c
@@ -9,6 +9,7 @@
 #include "floor/floor.h"
 #include "game-option/special-options.h"
 #include "main/sound-definitions-table.h"
+#include "main/sound-of-music.h"
 #include "monster-race/race-flags2.h"
 #include "monster-race/race-indice-types.h"
 #include "monster/monster-describer.h"

diff --git a/src/store/say-comments.c b/src/store/say-comments.c
index 780be10..319feeb 100644 (file)
--- a/src/store/say-comments.c
+++ b/src/store/say-comments.c
@@ -1,6 +1,6 @@
-#include "system/angband.h"
-#include "store/say-comments.h"
+#include "store/say-comments.h"
 #include "main/sound-definitions-table.h"
+#include "main/sound-of-music.h"
 #include "store/store-owner-comments.h"
 #include "store/store-util.h"
 #include "player/avatar.h"

diff --git a/src/store/say-comments.h b/src/store/say-comments.h
index 2de542d..60e84e4 100644 (file)
--- a/src/store/say-comments.h
+++ b/src/store/say-comments.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include "system/angband.h"
+
 void say_comment_1(player_type *player_ptr);
 void say_comment_2(PRICE value, int annoyed);
 void say_comment_3(PRICE value, int annoyed);

diff --git a/src/store/store.c b/src/store/store.c
index d4afc65..55fb2c8 100644 (file)
--- a/src/store/store.c
+++ b/src/store/store.c
@@ -48,6 +48,7 @@
 #include "locale/japanese.h"
 #include "main/music-definitions-table.h"
 #include "main/sound-definitions-table.h"
+#include "main/sound-of-music.h"
 #include "market/gold-magnification-table.h"
 #include "mind/mind.h"
 #include "object-enchant/item-feeling.h"
@@ -76,7 +77,6 @@
 #include "system/angband.h"
 #include "term/gameterm.h"
 #include "util/object-sort.h"
-#include "util/util.h"
 #include "view/display-main-window.h"
 #include "view/object-describer.h"
 #include "world/world.h"

diff --git a/src/util/util.c b/src/util/util.c
index 4bb31f5..486c8df 100644 (file)
--- a/src/util/util.c
+++ b/src/util/util.c
@@ -31,6 +31,7 @@
 #include "io/write-diary.h"
 #include "locale/japanese.h"
 #include "main/music-definitions-table.h"
+#include "main/sound-of-music.h"
 #include "monster-race/monster-race-hook.h"
 #include "player/player-class.h"
 #include "system/system-variables.h"
@@ -176,131 +177,6 @@ void flush(void)
 
 
 /*
- * Flush the screen, make a noise
- */
-void bell(void)
-{
-       Term_fresh();
-       if (ring_bell) Term_xtra(TERM_XTRA_NOISE, 0);
-
-       flush();
-}
-
-
-/*
- * todo intをsound_typeに差し替える
- * @brief 音を鳴らす
- */
-void sound(int val)
-{
-       if (!use_sound) return;
-
-       Term_xtra(TERM_XTRA_SOUND, val);
-}
-
-
-/*
- * Hack -- Play a music
- */
-errr play_music(int type, int val)
-{
-       if (!use_music) return 1;
-
-       return Term_xtra(type, val);
-}
-
-
-/*
- * Hack -- Select floor music.
- */
-void select_floor_music(player_type *player_ptr)
-{
-       if (!use_music) return;
-
-       if (player_ptr->ambush_flag)
-       {
-               if (!play_music(TERM_XTRA_MUSIC_BASIC, MUSIC_BASIC_AMBUSH)) return;
-       }
-
-       if (player_ptr->wild_mode)
-       {
-               if (!play_music(TERM_XTRA_MUSIC_BASIC, MUSIC_BASIC_WILD)) return;
-       }
-
-       if (player_ptr->current_floor_ptr->inside_arena)
-       {
-               if (!play_music(TERM_XTRA_MUSIC_BASIC, MUSIC_BASIC_ARENA)) return;
-       }
-
-       if (player_ptr->phase_out)
-       {
-               if (!play_music(TERM_XTRA_MUSIC_BASIC, MUSIC_BASIC_BATTLE)) return;
-       }
-
-       if (player_ptr->current_floor_ptr->inside_quest)
-       {
-               if (!play_music(TERM_XTRA_MUSIC_QUEST, player_ptr->current_floor_ptr->inside_quest)) return;
-               if (!play_music(TERM_XTRA_MUSIC_BASIC, MUSIC_BASIC_QUEST)) return;
-       }
-
-       if (player_ptr->dungeon_idx)
-       {
-               if (player_ptr->feeling == 2)
-               {
-                       if (!play_music(TERM_XTRA_MUSIC_BASIC, MUSIC_BASIC_DUN_FEEL2)) return;
-               }
-               else if (player_ptr->feeling >= 3 && player_ptr->feeling <= 5)
-               {
-                       if (!play_music(TERM_XTRA_MUSIC_BASIC, MUSIC_BASIC_DUN_FEEL1)) return;
-               }
-               else
-               {
-                       if (!play_music(TERM_XTRA_MUSIC_DUNGEON, player_ptr->dungeon_idx)) return;
-
-                       if (player_ptr->current_floor_ptr->dun_level < 40)
-                       {
-                               if (!play_music(TERM_XTRA_MUSIC_BASIC, MUSIC_BASIC_DUN_LOW)) return;
-                       }
-                       else if (player_ptr->current_floor_ptr->dun_level < 80)
-                       {
-                               if (!play_music(TERM_XTRA_MUSIC_BASIC, MUSIC_BASIC_DUN_MED)) return;
-                       }
-                       else
-                       {
-                               if (!play_music(TERM_XTRA_MUSIC_BASIC, MUSIC_BASIC_DUN_HIGH)) return;
-                       }
-               }
-       }
-
-       if (player_ptr->town_num)
-       {
-               if (!play_music(TERM_XTRA_MUSIC_TOWN, player_ptr->town_num)) return;
-               if (!play_music(TERM_XTRA_MUSIC_BASIC, MUSIC_BASIC_TOWN)) return;
-               return;
-       }
-
-       if (!player_ptr->current_floor_ptr->dun_level)
-       {
-               if (player_ptr->lev >= 45)
-               {
-                       if (!play_music(TERM_XTRA_MUSIC_BASIC, MUSIC_BASIC_FIELD3)) return;
-               }
-               else if (player_ptr->lev >= 25)
-               {
-                       if (!play_music(TERM_XTRA_MUSIC_BASIC, MUSIC_BASIC_FIELD2)) return;
-               }
-               else
-               {
-                       if (!play_music(TERM_XTRA_MUSIC_BASIC, MUSIC_BASIC_FIELD1)) return;
-               }
-       }
-
-       play_music(TERM_XTRA_MUSIC_MUTE, 0);
-}
-
-
-
-/*
  * Helper function called only from "inkey()"
  *
  * This function does almost all of the "macro" processing.

diff --git a/src/util/util.h b/src/util/util.h
index 7f70db1..0bbca05 100644 (file)
--- a/src/util/util.h
+++ b/src/util/util.h
@@ -221,10 +221,6 @@ extern const char hexsym[16];
 
 // todo ファイル処理関数・メッセージ処理関数・画面描画関数で最低限分割する.
 extern void flush(void);
-extern void bell(void);
-extern errr play_music(int type, int num);
-extern void select_floor_music(player_type *player_ptr);
-extern void sound(int num);
 extern void move_cursor(int row, int col);
 extern char inkey(void);
 extern concptr quark_str(STR_OFFSET num);

diff --git a/src/view/display-main-window.c b/src/view/display-main-window.c
index bc7aa84..099059f 100644 (file)
--- a/src/view/display-main-window.c
+++ b/src/view/display-main-window.c
@@ -32,6 +32,7 @@
 #include "io/files-util.h"
 #include "io/input-key-processor.h"
 #include "io/targeting.h"
+#include "main/sound-of-music.h"
 #include "market/arena-info-table.h"
 #include "monster-race/race-flags1.h"
 #include "monster-race/race-flags2.h"
@@ -57,7 +58,6 @@
 #include "system/system-variables.h"
 #include "term/gameterm.h"
 #include "term/term-color-types.h"
-#include "util/util.h"
 #include "view/display-lore.h"
 #include "view/display-player.h"
 #include "view/object-describer.h"
@@ -3633,7 +3633,7 @@ void display_map(player_type *player_ptr, int *cy, int *cx)
        C_KILL(ma, (hgt + 2), TERM_COLOR *);
        C_KILL(mc, (hgt + 2), char_ptr);
        C_KILL(mp, (hgt + 2), byte_ptr);
-       C_KILL(match_autopick_yx, (hgt + 2), sint_ptr);
+       C_KILL(match_autopick_yx, (hgt + 2), int*);
        C_KILL(object_autopick_yx, (hgt + 2), object_type **);
 
        /* Free each line map */

diff --git a/src/wizard/wizard-spoiler.c b/src/wizard/wizard-spoiler.c
index 93341b8..5466a65 100644 (file)
--- a/src/wizard/wizard-spoiler.c
+++ b/src/wizard/wizard-spoiler.c
@@ -14,6 +14,7 @@
 #include "core/sort.h"
 #include "floor/floor-town.h"
 #include "io/files-util.h"
+#include "main/sound-of-music.h"
 #include "monster-race/race-flags1.h"
 #include "monster-race/race-flags7.h"
 #include "object-enchant/artifact.h"

diff --git a/src/world/world-movement-processor.c b/src/world/world-movement-processor.c
index 7d11979..1bc24eb 100644 (file)
--- a/src/world/world-movement-processor.c
+++ b/src/world/world-movement-processor.c
@@ -7,6 +7,7 @@
 #include "game-option/special-options.h"
 #include "io/write-diary.h"
 #include "main/sound-definitions-table.h"
+#include "main/sound-of-music.h"
 #include "monster-race/race-flags1.h"
 #include "player/player-move.h"
 #include "view/display-main-window.h"