mpo/VVVVVV
1
0
Fork 0
mirror of https://github.com/TerryCavanagh/VVVVVV.git synced 2025-01-10 19:09:45 +01:00
Code Issues Releases Wiki Activity

Fix custom assets being unmounted in scriptclass::hardreset()

Browse source 
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.
This commit is contained in:
Misa 2020-06-03 17:49:48 -07:00 committed by Ethan Lee
parent b7a2cc1c22
commit c561cd9740
2 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
desktop_version/src/Game.cpp
View file

@ -7385,6 +7385,7 @@ void Game::quittomenu()
createmenu(Menu::mainmenu); createmenu(Menu::mainmenu);
} }
script.hardreset(); script.hardreset();
FILESYSTEM_unmountassets();
} }
void Game::returntolab() void Game::returntolab()

3
desktop_version/src/Script.cpp
View file

@ -6,8 +6,6 @@
#include "KeyPoll.h" #include "KeyPoll.h"
#include "Map.h" #include "Map.h"
#include "FileSystemUtils.h"
scriptclass::scriptclass() scriptclass::scriptclass()
{ {
//Start SDL //Start SDL
@ -2508,7 +2506,6 @@ void scriptclass::resetgametomenu()
void scriptclass::startgamemode( int t ) void scriptclass::startgamemode( int t )
{ {
FILESYSTEM_unmountassets();
switch(t) switch(t)
{ {
case 0: //Normal new game case 0: //Normal new game