diff --git a/desktop_version/src/FileSystemUtils.cpp b/desktop_version/src/FileSystemUtils.cpp index f4513400..8d4f58f4 100644 --- a/desktop_version/src/FileSystemUtils.cpp +++ b/desktop_version/src/FileSystemUtils.cpp @@ -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); 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') { diff --git a/desktop_version/src/FileSystemUtils.h b/desktop_version/src/FileSystemUtils.h index 5efcdc2c..6da59560 100644 --- a/desktop_version/src/FileSystemUtils.h +++ b/desktop_version/src/FileSystemUtils.h @@ -16,8 +16,8 @@ bool FILESYSTEM_isFile(const char* filename); bool FILESYSTEM_isMounted(const char* filename); void FILESYSTEM_loadZip(const char* filename); -void FILESYSTEM_mountassets(const char *path); -void FILESYSTEM_unmountassets(void); +void FILESYSTEM_mountAssets(const char *path); +void FILESYSTEM_unmountAssets(void); bool FILESYSTEM_isAssetMounted(const char* filename); void FILESYSTEM_loadFileToMemory(const char *name, unsigned char **mem, diff --git a/desktop_version/src/Game.cpp b/desktop_version/src/Game.cpp index ea1dad1e..45965661 100644 --- a/desktop_version/src/Game.cpp +++ b/desktop_version/src/Game.cpp @@ -6544,7 +6544,7 @@ void Game::quittomenu(void) { gamestate = TITLEMODE; graphics.fademode = 4; - FILESYSTEM_unmountassets(); + FILESYSTEM_unmountAssets(); graphics.titlebg.tdrawback = true; graphics.flipmode = false; //Don't be stuck on the summary screen, diff --git a/desktop_version/src/editor.cpp b/desktop_version/src/editor.cpp index 4300f5a4..7c31e54d 100644 --- a/desktop_version/src/editor.cpp +++ b/desktop_version/src/editor.cpp @@ -1748,14 +1748,14 @@ bool editorclass::load(std::string& _path) _path = levelDir + _path; } - FILESYSTEM_unmountassets(); + FILESYSTEM_unmountAssets(); if (game.playassets != "") { - FILESYSTEM_mountassets(game.playassets.c_str()); + FILESYSTEM_mountAssets(game.playassets.c_str()); } else { - FILESYSTEM_mountassets(_path.c_str()); + FILESYSTEM_mountAssets(_path.c_str()); } tinyxml2::XMLDocument doc; diff --git a/desktop_version/src/main.cpp b/desktop_version/src/main.cpp index 501b6f2e..0c1e4e7a 100644 --- a/desktop_version/src/main.cpp +++ b/desktop_version/src/main.cpp @@ -409,7 +409,7 @@ int main(int argc, char *argv[]) { ARG_INNER({ 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"; }) }