[Refactor] #38997 select_floor_music() に player_type * 引数を追加． / Add player_type ...

diff --git a/src/bldg.c b/src/bldg.c
index ecf349d..b301b3b 100644 (file)
--- a/src/bldg.c
+++ b/src/bldg.c
@@ -4197,7 +4197,7 @@ void do_cmd_bldg(void)
                handle_stuff();
        }
 
-       select_floor_music();
+       select_floor_music(p_ptr);
 
        msg_flag = FALSE;
        msg_erase();

diff --git a/src/core.c b/src/core.c
index f97abb2..cf86d4b 100644 (file)
--- a/src/core.c
+++ b/src/core.c
@@ -5505,7 +5505,7 @@ void play_game(bool new_game)
                process_dungeon_file("w_info.txt", 0, 0, current_world_ptr->max_wild_y, current_world_ptr->max_wild_x);
                init_flags = INIT_ONLY_BUILDINGS;
                process_dungeon_file("t_info.txt", 0, 0, MAX_HGT, MAX_WID);
-               select_floor_music();
+               select_floor_music(p_ptr);
        }
 
        /* Generate a dungeon level if needed */
@@ -5599,7 +5599,7 @@ void play_game(bool new_game)
        (void)combine_and_reorder_home(STORE_HOME);
        (void)combine_and_reorder_home(STORE_MUSEUM);
 
-       select_floor_music();
+       select_floor_music(p_ptr);
 
        /* Process */
        while (TRUE)

diff --git a/src/floor-events.c b/src/floor-events.c
index c86ad64..0a653cc 100644 (file)
--- a/src/floor-events.c
+++ b/src/floor-events.c
@@ -316,7 +316,7 @@ void update_dungeon_feeling(floor_type *floor_ptr)
        /* Announce feeling */
        do_cmd_feeling(p_ptr);
 
-       select_floor_music();
+       select_floor_music(p_ptr);
 
        /* Update the level indicator */
        p_ptr->redraw |= (PR_DEPTH);

diff --git a/src/floor-save.c b/src/floor-save.c
index 2dcca0a..a439fed 100644 (file)
--- a/src/floor-save.c
+++ b/src/floor-save.c
@@ -1404,6 +1404,6 @@ void change_floor(BIT_FLAGS floor_mode)
        /* Clear all flags */
        floor_mode = 0L;
 
-       select_floor_music();
+       select_floor_music(p_ptr);
        p_ptr->change_floor_mode = 0;
 }

diff --git a/src/main-win.c b/src/main-win.c
index e4d37aa..d97c82b 100644 (file)
--- a/src/main-win.c
+++ b/src/main-win.c
@@ -2355,7 +2355,7 @@ static errr Term_xtra_win_react(void)
                use_music = arg_music;
 
                if(!arg_music) stop_music();
-               else select_floor_music();
+               else select_floor_music(p_ptr);
 
        }
 

diff --git a/src/store.c b/src/store.c
index 78d9dd6..44a27d6 100644 (file)
--- a/src/store.c
+++ b/src/store.c
@@ -5940,7 +5940,7 @@ void do_cmd_store(void)
                if (st_ptr->store_open >= current_world_ptr->game_turn) leave_store = TRUE;
        }
 
-       select_floor_music();
+       select_floor_music(p_ptr);
 
        p_ptr->town_num = old_town_num;
 

diff --git a/src/util.c b/src/util.c
index 61cd6e0..bd91c41 100644 (file)
--- a/src/util.c
+++ b/src/util.c
@@ -1798,49 +1798,49 @@ errr play_music(int type, int val)
 /*
  * Hack -- Select floor music.
  */
-void select_floor_music(void)
+void select_floor_music(player_type *player_ptr)
 {
        if (!use_music) return;
 
-       if (p_ptr->ambush_flag)
+       if (player_ptr->ambush_flag)
        {
                if (!play_music(TERM_XTRA_MUSIC_BASIC, MUSIC_BASIC_AMBUSH)) return;
        } 
 
-       if(p_ptr->wild_mode)
+       if(player_ptr->wild_mode)
        {
                if (!play_music(TERM_XTRA_MUSIC_BASIC, MUSIC_BASIC_WILD)) return;
        }
 
-       if(p_ptr->inside_arena)
+       if(player_ptr->inside_arena)
        {
                if (!play_music(TERM_XTRA_MUSIC_BASIC, MUSIC_BASIC_ARENA)) return;
        }
 
-       if(p_ptr->phase_out)
+       if(player_ptr->phase_out)
        {
                if (!play_music(TERM_XTRA_MUSIC_BASIC, MUSIC_BASIC_BATTLE)) return;
        }
 
-       if(p_ptr->inside_quest)
+       if(player_ptr->inside_quest)
        {
-               if (!play_music(TERM_XTRA_MUSIC_QUEST, p_ptr->inside_quest)) return;
+               if (!play_music(TERM_XTRA_MUSIC_QUEST, player_ptr->inside_quest)) return;
                if (!play_music(TERM_XTRA_MUSIC_BASIC, MUSIC_BASIC_QUEST)) return;
        }
 
-       if(p_ptr->dungeon_idx)
+       if(player_ptr->dungeon_idx)
        {
-               if (p_ptr->feeling == 2)
+               if (player_ptr->feeling == 2)
                {
                        if (!play_music(TERM_XTRA_MUSIC_BASIC, MUSIC_BASIC_DUN_FEEL2)) return;
                }
-               else if (p_ptr->feeling >= 3 && p_ptr->feeling <= 5)
+               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, p_ptr->dungeon_idx)) return;
+                       if (!play_music(TERM_XTRA_MUSIC_DUNGEON, player_ptr->dungeon_idx)) return;
 
                        if (current_floor_ptr->dun_level < 40)
                        {
@@ -1857,20 +1857,20 @@ void select_floor_music(void)
                }
        }
 
-       if(p_ptr->town_num)
+       if(player_ptr->town_num)
        {
-               if (!play_music(TERM_XTRA_MUSIC_TOWN, p_ptr->town_num)) return;
+               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(!current_floor_ptr->dun_level)
        {
-               if (p_ptr->lev >= 45)
+               if (player_ptr->lev >= 45)
                {
                        if (!play_music(TERM_XTRA_MUSIC_BASIC, MUSIC_BASIC_FIELD3)) return;
                }
-               else if (p_ptr->lev >= 25)
+               else if (player_ptr->lev >= 25)
                {
                        if (!play_music(TERM_XTRA_MUSIC_BASIC, MUSIC_BASIC_FIELD2)) return;
                }

diff --git a/src/util.h b/src/util.h
index 05484e7..392db21 100644 (file)
--- a/src/util.h
+++ b/src/util.h
@@ -379,7 +379,7 @@ extern errr fd_close(int fd);
 extern void flush(void);
 extern void bell(void);
 extern errr play_music(int type, int num);
-extern void select_floor_music(void);
+extern void select_floor_music(player_type *player_ptr);
 extern void sound(int num);
 extern void move_cursor(int row, int col);
 extern void text_to_ascii(char *buf, concptr str);