Ancurio
/
mkxp-freebird
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Filesystem: Search for "Fonts/" with case-insensitivity

This commit is contained in:
Jonas Kulla 2017-03-08 16:30:07 +01:00
parent 6349146e01
commit 0f9b5f274a
1 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/filesystem.cpp
View File

@ -458,7 +458,7 @@ struct FontSetsCBData
SharedFontState *sfs; SharedFontState *sfs;
}; };
static void fontSetEnumCB(void *data, const char *, static void fontSetEnumCB(void *data, const char *dir,
const char *fname) const char *fname)
{ {
FontSetsCBData *d = static_cast<FontSetsCBData*>(data); FontSetsCBData *d = static_cast<FontSetsCBData*>(data);
@ -480,7 +480,7 @@ static void fontSetEnumCB(void *data, const char *,
return; return;
char filename[512]; char filename[512];
snprintf(filename, sizeof(filename), "Fonts/%s", fname); snprintf(filename, sizeof(filename), "%s/%s", dir, fname);
PHYSFS_File *handle = PHYSFS_openRead(filename); PHYSFS_File *handle = PHYSFS_openRead(filename);
@ -495,11 +495,29 @@ static void fontSetEnumCB(void *data, const char *,
SDL_RWclose(&ops); SDL_RWclose(&ops);
} }
/* Basically just a case-insensitive search
* for the folder "Fonts"... */
static void findFontsFolderCB(void *data, const char *,
const char *fname)
{
size_t i = 0;
char buffer[512];
const char *s = fname;
while (s && i < sizeof(buffer))
buffer[i++] = tolower(*s++);
buffer[i] = '\0';
if (strcmp(buffer, "fonts") == 0)
PHYSFS_enumerateFilesCallback(fname, fontSetEnumCB, data);
}
void FileSystem::initFontSets(SharedFontState &sfs) void FileSystem::initFontSets(SharedFontState &sfs)
{ {
FontSetsCBData d = { p, &sfs }; FontSetsCBData d = { p, &sfs };
PHYSFS_enumerateFilesCallback("Fonts", fontSetEnumCB, &d); PHYSFS_enumerateFilesCallback(".", findFontsFolderCB, &d);
} }
struct OpenReadEnumData struct OpenReadEnumData