[Refactor] #37353 dungeon_idx を player_type 構造体に編入。 / Enter dungeon_idx to player_typ...

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

diff --git a/src/util.c b/src/util.c
index 8a8dd00..692376e 100644 (file)
--- a/src/util.c
+++ b/src/util.c
@@ -1718,7 +1718,7 @@ void select_floor_music(void)
        { // TODO マクロで類似条件を統合すること
                if(quest[i].status == QUEST_STATUS_TAKEN &&
                        (quest[i].type == QUEST_TYPE_KILL_LEVEL || quest[i].type == QUEST_TYPE_RANDOM) &&
-                        quest[i].level == dun_level && dungeon_idx == quest[i].dungeon)
+                        quest[i].level == dun_level && p_ptr->dungeon_idx == quest[i].dungeon)
                {
                        if(play_music(TERM_XTRA_MUSIC_QUEST, i)) 
                        {
@@ -1728,13 +1728,13 @@ void select_floor_music(void)
                }
        }
 
-       if(dungeon_idx)
+       if(p_ptr->dungeon_idx)
        {
                if(p_ptr->feeling == 2) play_music(TERM_XTRA_MUSIC_BASIC, MUSIC_BASIC_DUN_FEEL2);
                else if(p_ptr->feeling >= 3 && p_ptr->feeling <= 5) play_music(TERM_XTRA_MUSIC_BASIC, MUSIC_BASIC_DUN_FEEL1);
                else
                {
-                       if(play_music(TERM_XTRA_MUSIC_DUNGEON, dungeon_idx))
+                       if(play_music(TERM_XTRA_MUSIC_DUNGEON, p_ptr->dungeon_idx))
                        {
                                if(dun_level < 40) play_music(TERM_XTRA_MUSIC_BASIC, MUSIC_BASIC_DUN_LOW);
                                else if(dun_level < 80) play_music(TERM_XTRA_MUSIC_BASIC, MUSIC_BASIC_DUN_MED);