Browse Source

REDESIGNED: IsFileExtension()

Now it accepts a ';' separated list of extensions, useful to check multiple extensions
pull/986/head
Ray 5 years ago
parent
commit
7baa2975ec
2 changed files with 10 additions and 21 deletions
  1. +9
    -20
      src/core.c
  2. +1
    -1
      src/text.c

+ 9
- 20
src/core.c View File

@ -1796,29 +1796,18 @@ bool FileExists(const char *fileName)
bool IsFileExtension(const char *fileName, const char *ext)
{
bool result = false;
const char *fileExt;
if ((fileExt = strrchr(fileName, '.')) != NULL)
const char *fileExt = GetExtension(fileName);
int extCount = 0;
const char **checkExts = TextSplit(ext, ';', &extCount);
for (int i = 0; i < extCount; i++)
{
#if defined(_WIN32)
result = true;
int extLen = strlen(ext);
if (strlen(fileExt) == extLen)
if (strcmp(fileExt, checkExts[i] + 1) == 0)
{
for (int i = 0; i < extLen; i++)
{
if (tolower(fileExt[i]) != tolower(ext[i]))
{
result = false;
break;
}
}
result = true;
break;
}
else result = false;
#else
if (strcmp(fileExt, ext) == 0) result = true;
#endif
}
return result;

+ 1
- 1
src/text.c View File

@ -284,7 +284,7 @@ Font LoadFont(const char *fileName)
Font font = { 0 };
#if defined(SUPPORT_FILEFORMAT_TTF)
if (IsFileExtension(fileName, ".ttf";) || IsFileExtension(fileName, ".otf")) font = LoadFontEx(fileName, DEFAULT_TTF_FONTSIZE, NULL, DEFAULT_TTF_NUMCHARS);
if (IsFileExtension(fileName, ".ttf;.otf")) font = LoadFontEx(fileName, DEFAULT_TTF_FONTSIZE, NULL, DEFAULT_TTF_NUMCHARS);
else
#endif
#if defined(SUPPORT_FILEFORMAT_FNT)

Loading…
Cancel
Save