From c561cd97408c0415a8ef7a9b69a33f2eef3626ea Mon Sep 17 00:00:00 2001
From: Misa <infoteddyatgitgud@cock.li>
Date: Wed, 3 Jun 2020 17:49:48 -0700
Subject: [PATCH] Fix custom assets being unmounted in scriptclass::hardreset()

This resulted in two bugs:
 1. Custom assets would not be unmounted when quitting to the menu.
 2. Custom assets would be unmounted when playtesting a level.

The solution is to unmount assets in Game::quittomenu() instead.
---
 desktop_version/src/Game.cpp   | 1 +
 desktop_version/src/Script.cpp | 3 ---
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/desktop_version/src/Game.cpp b/desktop_version/src/Game.cpp
index a48d5586..19ed7f27 100644
--- a/desktop_version/src/Game.cpp
+++ b/desktop_version/src/Game.cpp
@@ -7385,6 +7385,7 @@ void Game::quittomenu()
         createmenu(Menu::mainmenu);
     }
     script.hardreset();
+    FILESYSTEM_unmountassets();
 }
 
 void Game::returntolab()
diff --git a/desktop_version/src/Script.cpp b/desktop_version/src/Script.cpp
index 9594b6f7..873265e4 100644
--- a/desktop_version/src/Script.cpp
+++ b/desktop_version/src/Script.cpp
@@ -6,8 +6,6 @@
 #include "KeyPoll.h"
 #include "Map.h"
 
-#include "FileSystemUtils.h"
-
 scriptclass::scriptclass()
 {
 	//Start SDL
@@ -2508,7 +2506,6 @@ void scriptclass::resetgametomenu()
 
 void scriptclass::startgamemode( int t )
 {
-	FILESYSTEM_unmountassets();
 	switch(t)
 	{
 	case 0:  //Normal new game