From 39f93def95b3265aaf79e0b1b2f3de12eee32199 Mon Sep 17 00:00:00 2001
From: CaptainSegis <F20121237@outlook.com>
Date: Fri, 14 Apr 2017 11:56:35 -0500
Subject: [PATCH] Implemented @Music.ForcePlay command

---
 .../Construct/Framework/ScriptClasses/CL_Music.vb    | 12 ++++++++++++
 2.5DHero/2.5DHero/Resources/Sound/NewMusicManager.vb |  7 ++++++-
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/2.5DHero/2.5DHero/Construct/Framework/ScriptClasses/CL_Music.vb b/2.5DHero/2.5DHero/Construct/Framework/ScriptClasses/CL_Music.vb
index 2c3ea3995..448ac0d94 100644
--- a/2.5DHero/2.5DHero/Construct/Framework/ScriptClasses/CL_Music.vb
+++ b/2.5DHero/2.5DHero/Construct/Framework/ScriptClasses/CL_Music.vb
@@ -20,6 +20,18 @@
             Return Core.Null
         End Function
 
+        <ScriptCommand("ForcePlay")>
+        <ScriptDescription("Plays music and sets the music loop ignoring last song and without fade-in.")>
+        Private Function M_ForcePlay(ByVal argument As String) As String
+            MusicPlayer.GetInstance().ForcePlay(argument)
+
+            If Screen.Level IsNot Nothing Then
+                Screen.Level.MusicLoop = argument
+            End If
+
+            Return Core.Null
+        End Function
+
         <ScriptCommand("SetMusicLoop")>
         <ScriptDescription("Sets the music loop without playing music.")>
         Private Function M_SetMusicLoop(ByVal argument As String) As String
diff --git a/2.5DHero/2.5DHero/Resources/Sound/NewMusicManager.vb b/2.5DHero/2.5DHero/Resources/Sound/NewMusicManager.vb
index d004b1284..4d17d51fc 100644
--- a/2.5DHero/2.5DHero/Resources/Sound/NewMusicManager.vb
+++ b/2.5DHero/2.5DHero/Resources/Sound/NewMusicManager.vb
@@ -327,7 +327,12 @@ Public Class MusicPlayer
             End If
         End If
     End Sub
-
+    Public Sub ForcePlay(ByVal Song As String)
+        _currentSong = "nomusic"
+        _introPlaying = False
+        _introRemaining = TimeSpan.FromSeconds(0)
+        Play(Song, True, 1, 1)
+    End Sub
     ''' <summary>
     ''' This stops all music playback.
     ''' </summary>