From 199a8f45d6fe96cb6a43ad1452ef9457e87a237a Mon Sep 17 00:00:00 2001
From: Misa <infoteddyatgitgud@cock.li>
Date: Sat, 11 Jul 2020 11:55:26 -0700
Subject: [PATCH] Fix -playmusic command line option not working

There's a bug where playtesting from Ved doesn't properly play the music
of the level, due to no fault with Ved.

This was because the music was being faded out by
scriptclass::startgamemode() case 23 after main() called music.play().
To fix this, just call music.play() when all the other variables are
being set in Game::customloadquick().
---
 desktop_version/src/Game.cpp | 1 +
 desktop_version/src/Game.h   | 1 +
 desktop_version/src/main.cpp | 2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/desktop_version/src/Game.cpp b/desktop_version/src/Game.cpp
index 14eb272a..ce559976 100644
--- a/desktop_version/src/Game.cpp
+++ b/desktop_version/src/Game.cpp
@@ -5163,6 +5163,7 @@ void Game::customloadquick(std::string savfile)
         saverx = playrx;
         savery = playry;
         savegc = playgc;
+        music.play(playmusic);
         return;
     }
 
diff --git a/desktop_version/src/Game.h b/desktop_version/src/Game.h
index d9e04ded..dfb7b178 100644
--- a/desktop_version/src/Game.h
+++ b/desktop_version/src/Game.h
@@ -387,6 +387,7 @@ public:
     int playrx;
     int playry;
     int playgc;
+    int playmusic;
     std::string playassets;
 
     void quittomenu();
diff --git a/desktop_version/src/main.cpp b/desktop_version/src/main.cpp
index 1e607f94..1651d18e 100644
--- a/desktop_version/src/main.cpp
+++ b/desktop_version/src/main.cpp
@@ -353,8 +353,8 @@ int main(int argc, char *argv[])
             game.playrx = saverx;
             game.playry = savery;
             game.playgc = savegc;
+            game.playmusic = savemusic;
             game.cliplaytest = true;
-            music.play(savemusic);
             script.startgamemode(23);
         } else {
             script.startgamemode(22);