mpo/VVVVVV
1
0
Fork 0
mirror of https://github.com/TerryCavanagh/VVVVVV.git synced 2024-12-23 01:59:43 +01:00
Code Issues Releases Wiki Activity

Revert "Fix loading levels that are... uh, just levels."

Browse source 
This reverts commit ea74b93f38.

This is reverted for being a bit of a hack in my opinion.
This commit is contained in:
Misa 2021-08-18 09:52:38 -07:00
parent 0fd4f21710
commit a1df4c1383
3 changed files with 2 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
desktop_version/src/FileSystemUtils.cpp
View file

@ -241,7 +241,7 @@ bool FILESYSTEM_isMounted(const char* filename)
return PHYSFS_getMountPoint(filename) != NULL; return PHYSFS_getMountPoint(filename) != NULL;
} }
bool FILESYSTEM_exists(const char *fname) static bool FILESYSTEM_exists(const char *fname)
{ {
return PHYSFS_exists(fname); return PHYSFS_exists(fname);
} }

1
desktop_version/src/FileSystemUtils.h
View file

@ -17,7 +17,6 @@ char *FILESYSTEM_getUserLevelDirectory(void);
bool FILESYSTEM_isFile(const char* filename); bool FILESYSTEM_isFile(const char* filename);
bool FILESYSTEM_isMounted(const char* filename); bool FILESYSTEM_isMounted(const char* filename);
bool FILESYSTEM_exists(const char *filename);
void FILESYSTEM_loadZip(const char* filename); void FILESYSTEM_loadZip(const char* filename);
bool FILESYSTEM_mountAssets(const char *path); bool FILESYSTEM_mountAssets(const char *path);

6
desktop_version/src/editor.cpp
View file

@ -1770,11 +1770,7 @@ bool editorclass::load(std::string& _path)
} }
else else
{ {
/* "Sometimes a level is just a level." */ MAYBE_FAIL(FILESYSTEM_mountAssets(_path.c_str()));
if (!FILESYSTEM_exists(_path.c_str()))
{
MAYBE_FAIL(FILESYSTEM_mountAssets(_path.c_str()));
}
} }
if (!FILESYSTEM_loadTiXml2Document(_path.c_str(), doc)) if (!FILESYSTEM_loadTiXml2Document(_path.c_str(), doc))