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

Factor out mount path calculation to separate function

Browse source 
This means we don't have to copy-paste the virtual mount path
calculation code.
This commit is contained in:
Misa 2021-04-12 23:58:59 -07:00 committed by Ethan Lee
parent 488916b51c
commit 9b4691676f
1 changed files with 34 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
desktop_version/src/FileSystemUtils.cpp
View file

@ -383,6 +383,38 @@ void FILESYSTEM_unmountAssets(void)
} }
} }
static void getMountedPath(
char* buffer,
const size_t buffer_size,
const char* filename
) {
const char* path;
const bool assets_mounted = assetDir[0] != '\0';
char mounted_path[MAX_PATH];
if (assets_mounted)
{
SDL_snprintf(
mounted_path,
sizeof(mounted_path),
"%s%s",
virtualMountPath,
filename
);
}
if (assets_mounted && PHYSFS_exists(mounted_path))
{
path = mounted_path;
}
else
{
path = filename;
}
SDL_strlcpy(buffer, path, buffer_size);
}
bool FILESYSTEM_isAssetMounted(const char* filename) bool FILESYSTEM_isAssetMounted(const char* filename)
{ {
const char* realDir; const char* realDir;
@ -485,29 +517,9 @@ void FILESYSTEM_loadAssetToMemory(
size_t* len, size_t* len,
const bool addnull const bool addnull
) { ) {
const char* path; char path[MAX_PATH];
const bool assets_mounted = assetDir[0] != '\0';
char mounted_path[MAX_PATH];
if (assets_mounted) getMountedPath(path, sizeof(path), name);
{
SDL_snprintf(
mounted_path,
sizeof(mounted_path),
"%s%s",
virtualMountPath,
name
);
}
if (assets_mounted && PHYSFS_exists(mounted_path))
{
path = mounted_path;
}
else
{
path = name;
}
FILESYSTEM_loadFileToMemory(path, mem, len, addnull); FILESYSTEM_loadFileToMemory(path, mem, len, addnull);
} }