Merge branch 'master' of github.com:diasurgical/devilution

Source/mainmenu.cpp

@@ -8,7 +8,7 @@ char gszHero[16];
 
 /* data */
 
-int menu_music_track_id = 5;
+int menu_music_track_id = TMUSIC_INTRO;
 
 void mainmenu_refresh_music()
 {
@@ -16,9 +16,9 @@ void mainmenu_refresh_music()
 #ifndef SPAWN
 	do {
 		menu_music_track_id++;
-		if (menu_music_track_id == 6)
-			menu_music_track_id = 0;
-	} while (!menu_music_track_id || menu_music_track_id == 1);
+		if (menu_music_track_id == NUM_MUSIC)
+			menu_music_track_id = TMUSIC_TOWN;
+	} while (!menu_music_track_id || menu_music_track_id == TMUSIC_L1);
 #endif
 }
 

Source/monster.cpp

@@ -2546,7 +2546,7 @@ void DoEnding()
 	musicVolume = sound_get_or_set_music_volume(1);
 	sound_get_or_set_music_volume(0);
 
-	music_start(2);
+	music_start(TMUSIC_L2);
 	loop_movie = TRUE;
 	play_movie("gendata\\loopdend.smk", 1);
 	loop_movie = FALSE;

SourceX/sound.cpp

@@ -19,7 +19,7 @@ char *musicBuffer;
 
 BOOLEAN gbMusicOn = true;
 BOOLEAN gbSoundOn = true;
-int sgnMusicTrack = 6;
+int sgnMusicTrack = NUM_MUSIC;
 
 char *sgszMusicTracks[NUM_MUSIC] = {
 #ifdef SPAWN
@@ -183,7 +183,7 @@ void music_stop()
 		music = NULL;
 		musicRw = NULL;
 		mem_free_dbg(musicBuffer);
-		sgnMusicTrack = 6;
+		sgnMusicTrack = NUM_MUSIC;
 	}
 }
 
@@ -219,7 +219,7 @@ void sound_disable_music(BOOL disable)
 {
 	if (disable) {
 		music_stop();
-	} else if (sgnMusicTrack != 6) {
+	} else if (sgnMusicTrack != NUM_MUSIC) {
 		music_start(sgnMusicTrack);
 	}
 }