shithub: cstory

Download patch

ref: c9f17c4411d8d20a62e0f3b26a16b2a6b68504a8
parent: 9973dddbbd6dc1d0e3d598ef4025b9c980d848e8
author: Clownacy <Clownacy@users.noreply.github.com>
date: Thu Sep 17 09:09:53 EDT 2020 

Rename FreeType font functions


--- a/src/Draw.cpp
+++ b/src/Draw.cpp
@@ -706,7 +706,7 @@
 #endif
 	}
 
-	font = LoadFont(path.c_str(), width, height);
+	font = LoadFreeTypeFont(path.c_str(), width, height);
 #else
 	std::string bitmap_path;
 	std::string metadata_path;
--- a/src/Font.cpp
+++ b/src/Font.cpp
@@ -1094,7 +1094,7 @@
 }
 
 #ifdef FREETYPE_FONTS
-Font* LoadFontFromData(const unsigned char *data, size_t data_size, size_t cell_width, size_t cell_height)
+Font* LoadFreeTypeFontFromData(const unsigned char *data, size_t data_size, size_t cell_width, size_t cell_height)
 {
 	Font *font = (Font*)malloc(sizeof(Font));
 
@@ -1155,7 +1155,7 @@
 	return NULL;
 }
 
-Font* LoadFont(const char *font_filename, size_t cell_width, size_t cell_height)
+Font* LoadFreeTypeFont(const char *font_filename, size_t cell_width, size_t cell_height)
 {
 	Font *font = NULL;
 
@@ -1164,7 +1164,7 @@
 
 	if (file_buffer != NULL)
 	{
-		font = LoadFontFromData(file_buffer, file_size, cell_width, cell_height);
+		font = LoadFreeTypeFontFromData(file_buffer, file_size, cell_width, cell_height);
 		free(file_buffer);
 	}
 
--- a/src/Font.h
+++ b/src/Font.h
@@ -7,8 +7,8 @@
 typedef struct Font Font;
 
 #ifdef FREETYPE_FONTS
-Font* LoadFontFromData(const unsigned char *data, size_t data_size, size_t cell_width, size_t cell_height);
-Font* LoadFont(const char *font_filename, size_t cell_width, size_t cell_height);
+Font* LoadFreeTypeFontFromData(const unsigned char *data, size_t data_size, size_t cell_width, size_t cell_height);
+Font* LoadFreeTypeFont(const char *font_filename, size_t cell_width, size_t cell_height);
 #else
 Font* LoadBitmapFont(const char *bitmap_path, const char *metadata_path);
 #endif