Se.Cherkasov/VVVVVV
1
0
Fork 0
mirror of https://github.com/TerryCavanagh/VVVVVV.git synced 2026-01-30 09:54:10 +03:00
Code Issues Packages Projects Releases Wiki Activity

Do not close game if custom level has assets issues

Browse Source 
It's quite rude to close the game entirely if there is trouble with
assets. Instead, just unload the assets and gracefully return to the
title screen.
This commit is contained in:
Misa
2021-08-06 20:57:34 -07:00
committed by Ethan Lee
parent ed9cb4ca6d
commit 8dc5d69ef3
12 changed files with 118 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
desktop_version/src/editor.cpp
View File

@@ -1748,6 +1748,11 @@ void editorclass::switch_enemy(const bool reversed /*= false*/)
bool editorclass::load(std::string& _path)
{
tinyxml2::XMLDocument doc;
tinyxml2::XMLHandle hDoc(&doc);
tinyxml2::XMLElement* pElem;
tinyxml2::XMLHandle hRoot(NULL);
reset();
static const char *levelDir = "levels/";
@@ -1759,14 +1764,13 @@ bool editorclass::load(std::string& _path)
FILESYSTEM_unmountAssets();
if (game.cliplaytest && game.playassets != "")
{
FILESYSTEM_mountAssets(game.playassets.c_str());
MAYBE_FAIL(FILESYSTEM_mountAssets(game.playassets.c_str()));
}
else
{
FILESYSTEM_mountAssets(_path.c_str());
MAYBE_FAIL(FILESYSTEM_mountAssets(_path.c_str()));
}
tinyxml2::XMLDocument doc;
if (!FILESYSTEM_loadTiXml2Document(_path.c_str(), doc))
{
printf("No level %s to load :(\n", _path.c_str());
@@ -1775,9 +1779,6 @@ bool editorclass::load(std::string& _path)
loaded_filepath = _path;
tinyxml2::XMLHandle hDoc(&doc);
tinyxml2::XMLElement* pElem;
tinyxml2::XMLHandle hRoot(NULL);
version = 0;
{
@@ -2040,6 +2041,9 @@ next:
version=2;
return true;
fail:
return false;
}
bool editorclass::save(std::string& _path)