X-Git-Url: http://git.osdn.net/view?p=hengband%2Fhengband.git;a=blobdiff_plain;f=src%2Futil.c;fp=src%2Futil.c;h=8a8dd00efffe5cd3d26badf1e0445a7093964760;hp=70209423c7abf57a95e24641df821a691f277d60;hb=471fee03ffb2a8bf5e33fd9993543ebec2e36f9a;hpb=3dde055c7268532a6c82e26b2802cc7aaa99863e

diff --git a/src/util.c b/src/util.c
index 70209423c..8a8dd00ef 100644
--- 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_type == quest[i].dungeon)
+			 quest[i].level == dun_level && dungeon_idx == quest[i].dungeon)
 		{
 			if(play_music(TERM_XTRA_MUSIC_QUEST, i)) 
 			{
@@ -1728,13 +1728,13 @@ void select_floor_music(void)
 		}
 	}
 
-	if(dungeon_type)
+	if(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_type))
+			if(play_music(TERM_XTRA_MUSIC_DUNGEON, 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);