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

[hengband/hengband.git] / src / util / util.c

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.