From e93dc3fb6d1e7947fce4ef6b7956e4c42a270955 Mon Sep 17 00:00:00 2001
From: Asdow <20314541+Asdow@users.noreply.github.com>
Date: Mon, 29 Jan 2024 15:40:59 +0200
Subject: [PATCH] Allow separate enemy present & battle music for nighttime

Defaults to regular enemypresent and battle music if no nighttime music tracks are found
---
 Utils/Music Control.cpp | 15 +++++++++++++++
 Utils/Music Control.h   |  2 ++
 2 files changed, 17 insertions(+)

diff --git a/Utils/Music Control.cpp b/Utils/Music Control.cpp
index 740b5ed1..0d1361d7 100644
--- a/Utils/Music Control.cpp	
+++ b/Utils/Music Control.cpp	
@@ -8,6 +8,7 @@
 	#include "strategicmap.h"
 
 #include "Overhead Types.h"
+#include <Game Clock.h>
 
 static UINT32 uiMusicHandle = NO_SAMPLE;
 static BOOLEAN fMusicPlaying = FALSE;
@@ -140,6 +141,12 @@ void InitializeMusicLists()
 		case MUSICLIST_TACTICAL_BATTLE:
 			baseFilename = "MUSIC\\Battle_";
 			break;
+		case MUSICLIST_TACTICAL_ENEMYPRESENT_NIGHT:
+			baseFilename = "MUSIC\\EnemyNight_";
+			break;
+		case MUSICLIST_TACTICAL_BATTLE_NIGHT:
+			baseFilename = "MUSIC\\BattleNight_";
+			break;
 		case MUSICLIST_TACTICAL_VICTORY:
 			baseFilename = "MUSIC\\Victory_";
 			break;
@@ -528,6 +535,10 @@ static BOOLEAN StartMusicBasedOnMode(void)
 			{
 				MusicPlay(PickRandomSongFromList(MUSICLIST_TACTICAL_CREEPY));
 			}
+			else if (NightTime() && MusicLists[MUSICLIST_TACTICAL_ENEMYPRESENT_NIGHT].size() > 0)
+			{
+				MusicPlay(PickRandomSongFromList(MUSICLIST_TACTICAL_ENEMYPRESENT_NIGHT));
+			}
 			else
 			{
 				MusicPlay(PickRandomSongFromList(MUSICLIST_TACTICAL_ENEMYPRESENT));
@@ -541,6 +552,10 @@ static BOOLEAN StartMusicBasedOnMode(void)
 			{
 				MusicPlay(PickRandomSongFromList(MUSICLIST_TACTICAL_CREEPY_BATTLE));
 			}
+			else if (NightTime() && MusicLists[MUSICLIST_TACTICAL_BATTLE_NIGHT].size() > 0)
+			{
+				MusicPlay(PickRandomSongFromList(MUSICLIST_TACTICAL_BATTLE_NIGHT));
+			}
 			else
 			{
 				MusicPlay(PickRandomSongFromList(MUSICLIST_TACTICAL_BATTLE));
diff --git a/Utils/Music Control.h b/Utils/Music Control.h
index 3a998376..2d67f5d0 100644
--- a/Utils/Music Control.h	
+++ b/Utils/Music Control.h	
@@ -28,6 +28,8 @@ enum NewMusicList
 	MUSICLIST_TACTICAL_NOTHING,
 	MUSICLIST_TACTICAL_ENEMYPRESENT,
 	MUSICLIST_TACTICAL_BATTLE,
+	MUSICLIST_TACTICAL_ENEMYPRESENT_NIGHT,
+	MUSICLIST_TACTICAL_BATTLE_NIGHT,
 	MUSICLIST_TACTICAL_VICTORY,
 	MUSICLIST_TACTICAL_DEATH,
 	MUSICLIST_TACTICAL_CREEPY,