mirror of
https://github.com/TerryCavanagh/VVVVVV.git
synced 2024-12-23 10:09:43 +01:00
Reset cliplaytest when exiting to menu and check it when loading
This fixes a bug where quitting to the menu from command-line playtesting with -playassets specified would always use those assets when loading back in to any custom level. This also fixes loading in to a custom level quicksave always using the command-line playtesting arguments instead of using the actual quicksave.
This commit is contained in:
parent
174e804c6b
commit
e3145c09f2
2 changed files with 2 additions and 1 deletions
|
@ -6601,6 +6601,7 @@ void Game::quittomenu(void)
|
||||||
gamestate = TITLEMODE;
|
gamestate = TITLEMODE;
|
||||||
graphics.fademode = 4;
|
graphics.fademode = 4;
|
||||||
FILESYSTEM_unmountAssets();
|
FILESYSTEM_unmountAssets();
|
||||||
|
cliplaytest = false;
|
||||||
graphics.titlebg.tdrawback = true;
|
graphics.titlebg.tdrawback = true;
|
||||||
graphics.flipmode = false;
|
graphics.flipmode = false;
|
||||||
//Don't be stuck on the summary screen,
|
//Don't be stuck on the summary screen,
|
||||||
|
|
|
@ -1751,7 +1751,7 @@ bool editorclass::load(std::string& _path)
|
||||||
}
|
}
|
||||||
|
|
||||||
FILESYSTEM_unmountAssets();
|
FILESYSTEM_unmountAssets();
|
||||||
if (game.playassets != "")
|
if (game.cliplaytest && game.playassets != "")
|
||||||
{
|
{
|
||||||
FILESYSTEM_mountAssets(game.playassets.c_str());
|
FILESYSTEM_mountAssets(game.playassets.c_str());
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue