diff options
| author | Ray <[email protected]> | 2017-12-15 13:28:33 +0100 |
|---|---|---|
| committer | GitHub <[email protected]> | 2017-12-15 13:28:33 +0100 |
| commit | bcdde6c65af3eee20ce3a142eec800dece759c17 (patch) | |
| tree | 010601d5ad8b990acbc251dab448eabd134f3542 /src/text.c | |
| parent | 35d54dd7e4b317cb7c7a2c89db420335d3d9870c (diff) | |
| parent | 2affac820e64393ac4294c53c1a7f47742e8dec9 (diff) | |
| download | raylib-bcdde6c65af3eee20ce3a142eec800dece759c17.tar.gz raylib-bcdde6c65af3eee20ce3a142eec800dece759c17.zip | |
Merge pull request #420 from questor/develop
Develop
Diffstat (limited to 'src/text.c')
| -rw-r--r-- | src/text.c | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -290,11 +290,12 @@ SpriteFont LoadSpriteFont(const char *fileName) #if defined(SUPPORT_FILEFORMAT_TTF) if (IsFileExtension(fileName, ".ttf")) spriteFont = LoadSpriteFontEx(fileName, DEFAULT_TTF_FONTSIZE, 0, NULL); + else #endif #if defined(SUPPORT_FILEFORMAT_FNT) - else if (IsFileExtension(fileName, ".fnt")) spriteFont = LoadBMFont(fileName); -#endif + if (IsFileExtension(fileName, ".fnt")) spriteFont = LoadBMFont(fileName); else +#endif { Image image = LoadImage(fileName); if (image.data != NULL) spriteFont = LoadImageFont(image, MAGENTA, DEFAULT_FIRST_CHAR); |