From 195ac2a4a7b156c33c210eb314ed2e466401d3c6 Mon Sep 17 00:00:00 2001
From: Anders Jenbo <anders@jenbo.dk>
Date: Mon, 28 Oct 2019 21:42:33 +0100
Subject: [PATCH] Apply music enums

---
 Source/mainmenu.cpp | 8 ++++----
 Source/monster.cpp  | 2 +-
 Source/sound.cpp    | 6 +++---
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Source/mainmenu.cpp b/Source/mainmenu.cpp
index 5a1e94d14..317620e97 100644
--- a/Source/mainmenu.cpp
+++ b/Source/mainmenu.cpp
@@ -6,7 +6,7 @@ char gszHero[16];
 
 /* data */
 
-int menu_music_track_id = 5;
+int menu_music_track_id = TMUSIC_INTRO;
 
 void mainmenu_refresh_music()
 {
@@ -14,9 +14,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
 }
 
diff --git a/Source/monster.cpp b/Source/monster.cpp
index 7b60aed1d..8db5f0ab2 100644
--- a/Source/monster.cpp
+++ b/Source/monster.cpp
@@ -2544,7 +2544,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;
diff --git a/Source/sound.cpp b/Source/sound.cpp
index b1d8750a2..f8d108b66 100644
--- a/Source/sound.cpp
+++ b/Source/sound.cpp
@@ -15,7 +15,7 @@ LPDIRECTSOUNDBUFFER sglpDSB;
 BOOLEAN gbMusicOn = TRUE;
 BOOLEAN gbSoundOn = TRUE;
 BOOLEAN gbDupSounds = TRUE;
-int sgnMusicTrack = 6;
+int sgnMusicTrack = NUM_MUSIC;
 char *sgszMusicTracks[NUM_MUSIC] = {
 #ifdef SPAWN
 	"Music\\sTowne.wav",
@@ -447,7 +447,7 @@ void music_stop()
 		SFileDdaEnd(sgpMusicTrack);
 		SFileCloseFile(sgpMusicTrack);
 		sgpMusicTrack = NULL;
-		sgnMusicTrack = 6;
+		sgnMusicTrack = NUM_MUSIC;
 	}
 }
 
@@ -479,7 +479,7 @@ void sound_disable_music(BOOL disable)
 {
 	if (disable) {
 		music_stop();
-	} else if (sgnMusicTrack != 6) {
+	} else if (sgnMusicTrack != NUM_MUSIC) {
 		music_start(sgnMusicTrack);
 	}
 }