From f951f0c53667ea9d1b195343de3bfa9fbabe60ab Mon Sep 17 00:00:00 2001 From: Ray Date: Sun, 16 Jun 2019 23:42:51 +0200 Subject: [PATCH] RENAMED: LoadDefaultFont() -> LoadFontDefault() Renamed internal function for consistency with similar functions. --- src/core.c | 10 +++++----- src/text.c | 8 ++++---- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/core.c b/src/core.c index 0c96a538..da981fd0 100644 --- a/src/core.c +++ b/src/core.c @@ -445,8 +445,8 @@ static bool gifRecording = false; // GIF recording state // Other Modules Functions Declaration (required by core) //---------------------------------------------------------------------------------- #if defined(SUPPORT_DEFAULT_FONT) -extern void LoadDefaultFont(void); // [Module: text] Loads default font on InitWindow() -extern void UnloadDefaultFont(void); // [Module: text] Unloads default font from GPU memory +extern void LoadFontDefault(void); // [Module: text] Loads default font on InitWindow() +extern void UnloadFontDefault(void); // [Module: text] Unloads default font from GPU memory #endif //---------------------------------------------------------------------------------- @@ -661,7 +661,7 @@ void InitWindow(int width, int height, const char *title) #if defined(SUPPORT_DEFAULT_FONT) // Load default font // NOTE: External function (defined in module: text) - LoadDefaultFont(); + LoadFontDefault(); #endif #if defined(PLATFORM_RPI) @@ -719,7 +719,7 @@ void CloseWindow(void) #endif #if defined(SUPPORT_DEFAULT_FONT) - UnloadDefaultFont(); + UnloadFontDefault(); #endif rlglClose(); // De-init rlgl @@ -3880,7 +3880,7 @@ static void AndroidCommandCallback(struct android_app *app, int32_t cmd) #if defined(SUPPORT_DEFAULT_FONT) // Load default font // NOTE: External function (defined in module: text) - LoadDefaultFont(); + LoadFontDefault(); #endif // TODO: GPU assets reload in case of lost focus (lost context) diff --git a/src/text.c b/src/text.c index b1f51f44..9a0bcb36 100644 --- a/src/text.c +++ b/src/text.c @@ -91,8 +91,8 @@ static Font LoadBMFont(const char *fileName); // Load a BMFont file (AngelCo #endif #if defined(SUPPORT_DEFAULT_FONT) -extern void LoadDefaultFont(void); -extern void UnloadDefaultFont(void); +extern void LoadFontDefault(void); +extern void UnloadFontDefault(void); #endif //---------------------------------------------------------------------------------- @@ -101,7 +101,7 @@ extern void UnloadDefaultFont(void); #if defined(SUPPORT_DEFAULT_FONT) // Load raylib default font -extern void LoadDefaultFont(void) +extern void LoadFontDefault(void) { #define BIT_CHECK(a,b) ((a) & (1u << (b))) @@ -246,7 +246,7 @@ extern void LoadDefaultFont(void) } // Unload raylib default font -extern void UnloadDefaultFont(void) +extern void UnloadFontDefault(void) { UnloadTexture(defaultFont.texture); RL_FREE(defaultFont.chars);