summaryrefslogtreecommitdiffhomepage
path: root/src/text.c
diff options
context:
space:
mode:
authorRay <[email protected]>2017-04-24 00:18:53 +0200
committerGitHub <[email protected]>2017-04-24 00:18:53 +0200
commit71fe3c0b086c9cf7707d9ef455c57360f88be8a1 (patch)
tree1d1b7dfc780fd6049f68b5d69d9194add1302dfd /src/text.c
parent0ed82150f0228c949c36f9ee83d4c2e0c92f9d0e (diff)
parent9a515ae9db9f63d5bfa8545cfbbfdce683daf5f6 (diff)
downloadraylib-71fe3c0b086c9cf7707d9ef455c57360f88be8a1.tar.gz
raylib-71fe3c0b086c9cf7707d9ef455c57360f88be8a1.zip
Merge pull request #269 from raysan5/develop
Integrate develop branch
Diffstat (limited to 'src/text.c')
-rw-r--r--src/text.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/text.c b/src/text.c
index a057e347..cba9a7d6 100644
--- a/src/text.c
+++ b/src/text.c
@@ -50,7 +50,7 @@
#include <stdarg.h> // Required for: va_list, va_start(), vfprintf(), va_end()
#include <stdio.h> // Required for: FILE, fopen(), fclose(), fscanf(), feof(), rewind(), fgets()
-#include "utils.h" // Required for: IsFileExtension()
+#include "utils.h" // Required for: fopen() Android mapping
#if defined(SUPPORT_FILEFORMAT_TTF)
// Following libs are used on LoadTTF()
@@ -316,7 +316,7 @@ SpriteFont LoadSpriteFont(const char *fileName)
//UnloadResource(rres[0]);
}
#if defined(SUPPORT_FILEFORMAT_TTF)
- else if (IsFileExtension(fileName, ".ttf")) spriteFont = LoadSpriteFontTTF(fileName, DEFAULT_TTF_FONTSIZE, 0, NULL);
+ else if (IsFileExtension(fileName, ".ttf")) spriteFont = LoadSpriteFontEx(fileName, DEFAULT_TTF_FONTSIZE, 0, NULL);
#endif
#if defined(SUPPORT_FILEFORMAT_FNT)
else if (IsFileExtension(fileName, ".fnt")) spriteFont = LoadBMFont(fileName);
@@ -341,7 +341,7 @@ SpriteFont LoadSpriteFont(const char *fileName)
// Load SpriteFont from TTF font file with generation parameters
// NOTE: You can pass an array with desired characters, those characters should be available in the font
// if array is NULL, default char set is selected 32..126
-SpriteFont LoadSpriteFontTTF(const char *fileName, int fontSize, int charsCount, int *fontChars)
+SpriteFont LoadSpriteFontEx(const char *fileName, int fontSize, int charsCount, int *fontChars)
{
SpriteFont spriteFont = { 0 };