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

Properly camel-case FILESYSTEM_[un]mountassets()

Browse source 
They are now camel-cased to be consistent with the rest of the
filesystem functions.
This commit is contained in:
Misa 2021-04-03 12:48:47 -07:00 committed by Ethan Lee
parent 9c8ecdb0f4
commit a8a09a207f
5 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
desktop_version/src/FileSystemUtils.cpp
View file

@ -256,7 +256,7 @@ void FILESYSTEM_loadZip(const char* filename)
} }
} }
void FILESYSTEM_mountassets(const char* path) void FILESYSTEM_mountAssets(const char* path)
{ {
const size_t path_size = SDL_strlen(path); const size_t path_size = SDL_strlen(path);
char filename[MAX_PATH]; char filename[MAX_PATH];
@ -356,7 +356,7 @@ void FILESYSTEM_mountassets(const char* path)
} }
} }
void FILESYSTEM_unmountassets(void) void FILESYSTEM_unmountAssets(void)
{ {
if (assetDir[0] != '\0') if (assetDir[0] != '\0')
{ {

4
desktop_version/src/FileSystemUtils.h
View file

@ -16,8 +16,8 @@ bool FILESYSTEM_isFile(const char* filename);
bool FILESYSTEM_isMounted(const char* filename); bool FILESYSTEM_isMounted(const char* filename);
void FILESYSTEM_loadZip(const char* filename); void FILESYSTEM_loadZip(const char* filename);
void FILESYSTEM_mountassets(const char *path); void FILESYSTEM_mountAssets(const char *path);
void FILESYSTEM_unmountassets(void); void FILESYSTEM_unmountAssets(void);
bool FILESYSTEM_isAssetMounted(const char* filename); bool FILESYSTEM_isAssetMounted(const char* filename);
void FILESYSTEM_loadFileToMemory(const char *name, unsigned char **mem, void FILESYSTEM_loadFileToMemory(const char *name, unsigned char **mem,

2
desktop_version/src/Game.cpp
View file

@ -6544,7 +6544,7 @@ void Game::quittomenu(void)
{ {
gamestate = TITLEMODE; gamestate = TITLEMODE;
graphics.fademode = 4; graphics.fademode = 4;
FILESYSTEM_unmountassets(); FILESYSTEM_unmountAssets();
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,

6
desktop_version/src/editor.cpp
View file

@ -1748,14 +1748,14 @@ bool editorclass::load(std::string& _path)
_path = levelDir + _path; _path = levelDir + _path;
} }
FILESYSTEM_unmountassets(); FILESYSTEM_unmountAssets();
if (game.playassets != "") if (game.playassets != "")
{ {
FILESYSTEM_mountassets(game.playassets.c_str()); FILESYSTEM_mountAssets(game.playassets.c_str());
} }
else else
{ {
FILESYSTEM_mountassets(_path.c_str()); FILESYSTEM_mountAssets(_path.c_str());
} }
tinyxml2::XMLDocument doc; tinyxml2::XMLDocument doc;

2
desktop_version/src/main.cpp
View file

@ -409,7 +409,7 @@ int main(int argc, char *argv[])
{ {
ARG_INNER({ ARG_INNER({
i++; i++;
// Even if this is a directory, FILESYSTEM_mountassets() expects '.vvvvvv' on the end // Even if this is a directory, FILESYSTEM_mountAssets() expects '.vvvvvv' on the end
playassets = "levels/" + std::string(argv[i]) + ".vvvvvv"; playassets = "levels/" + std::string(argv[i]) + ".vvvvvv";
}) })
} }