mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-15 19:13:07 +01:00
Code Issues Releases Wiki Activity

Add more font config to config.ini (#3582)

Browse Source
This commit is contained in:
YJSoft
2016-05-14 02:23:11 +09:00
committed by Ted John
parent 0710eb7e87
commit f330ae478b
3 changed files with 24 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/config.c
View File

@@ -283,10 +283,18 @@ config_property_definition _notificationsDefinitions[] = {
};
config_property_definition _fontsDefinitions[] = {
{ offsetof(font_configuration, file_name), "file_name", CONFIG_VALUE_TYPE_STRING, {.value_string = NULL }, NULL },
{ offsetof(font_configuration, font_name), "font_name", CONFIG_VALUE_TYPE_STRING, {.value_string = NULL }, NULL },
{ offsetof(font_configuration, x_offset), "x_offset", CONFIG_VALUE_TYPE_SINT8, {.value_string = NULL }, NULL },
{ offsetof(font_configuration, y_offset), "y_offset", CONFIG_VALUE_TYPE_SINT8, {.value_string = NULL }, NULL }
{ offsetof(font_configuration, file_name), "file_name", CONFIG_VALUE_TYPE_STRING, {.value_string = NULL }, NULL },
{ offsetof(font_configuration, font_name), "font_name", CONFIG_VALUE_TYPE_STRING, {.value_string = NULL }, NULL },
{ offsetof(font_configuration, x_offset), "x_offset", CONFIG_VALUE_TYPE_SINT8, 0, NULL },
{ offsetof(font_configuration, y_offset), "y_offset", CONFIG_VALUE_TYPE_SINT8, -1, NULL },
{ offsetof(font_configuration, size_tiny), "size_tiny", CONFIG_VALUE_TYPE_UINT8, 8, NULL },
{ offsetof(font_configuration, size_small), "size_small", CONFIG_VALUE_TYPE_UINT8, 10, NULL },
{ offsetof(font_configuration, size_medium), "size_medium", CONFIG_VALUE_TYPE_UINT8, 11, NULL },
{ offsetof(font_configuration, size_big), "size_big", CONFIG_VALUE_TYPE_UINT8, 12, NULL },
{ offsetof(font_configuration, height_tiny), "height_tiny", CONFIG_VALUE_TYPE_UINT8, 6, NULL },
{ offsetof(font_configuration, height_small), "height_small", CONFIG_VALUE_TYPE_UINT8, 12, NULL },
{ offsetof(font_configuration, height_medium), "height_medium", CONFIG_VALUE_TYPE_UINT8, 12, NULL },
{ offsetof(font_configuration, height_big), "height_big", CONFIG_VALUE_TYPE_UINT8, 20, NULL }
};
config_section_definition _sectionDefinitions[] = {

8
src/config.h
View File

@@ -260,6 +260,14 @@ typedef struct font_configuration {
utf8string font_name;
sint8 x_offset;
sint8 y_offset;
uint8 size_tiny;
uint8 size_small;
uint8 size_medium;
uint8 size_big;
uint8 height_tiny;
uint8 height_small;
uint8 height_medium;
uint8 height_big;
} font_configuration;
// Define structures for any other settings here

8
src/localisation/language.cpp
View File

@@ -177,10 +177,10 @@ bool language_open(int id)
} else {
if (gConfigFonts.file_name != nullptr) {
static TTFFontSetDescriptor TTFFontCustom = {{
{ gConfigFonts.file_name, gConfigFonts.font_name, 11, gConfigFonts.x_offset, gConfigFonts.y_offset, 15, nullptr },
{ gConfigFonts.file_name, gConfigFonts.font_name, 11, gConfigFonts.x_offset, gConfigFonts.y_offset, 17, nullptr },
{ gConfigFonts.file_name, gConfigFonts.font_name, 11, gConfigFonts.x_offset, gConfigFonts.y_offset, 17, nullptr },
{ gConfigFonts.file_name, gConfigFonts.font_name, 11, gConfigFonts.x_offset, gConfigFonts.y_offset, 20, nullptr },
{ gConfigFonts.file_name, gConfigFonts.font_name, gConfigFonts.size_tiny, gConfigFonts.x_offset, gConfigFonts.y_offset, gConfigFonts.height_tiny, nullptr },
{ gConfigFonts.file_name, gConfigFonts.font_name, gConfigFonts.size_small, gConfigFonts.x_offset, gConfigFonts.y_offset, gConfigFonts.height_small, nullptr },
{ gConfigFonts.file_name, gConfigFonts.font_name, gConfigFonts.size_medium, gConfigFonts.x_offset, gConfigFonts.y_offset, gConfigFonts.height_medium, nullptr },
{ gConfigFonts.file_name, gConfigFonts.font_name, gConfigFonts.size_big, gConfigFonts.x_offset, gConfigFonts.y_offset, gConfigFonts.height_big, nullptr },
}};
ttf_dispose();
gUseTrueTypeFont = true;