Looki2000/sussycraft-engine
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

reverted back to original font size as it was too large and went beyond the buttons and gui

Browse Source
This commit is contained in:
Looki2000 2023-02-23 00:02:10 +01:00
parent 7cd2251fdb
commit e75af79d1b
3 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
builtin/settingtypes.txt
View File

@ -1673,7 +1673,7 @@ font_shadow (Font shadow) int 1 0 65535
font_shadow_alpha (Font shadow alpha) int 127 0 255 font_shadow_alpha (Font shadow alpha) int 127 0 255
# Font size of the default font where 1 unit = 1 pixel at 96 DPI # Font size of the default font where 1 unit = 1 pixel at 96 DPI
font_size (Font size) int 32 5 72 font_size (Font size) int 16 5 72
# For pixel-style fonts that do not scale well, this ensures that font sizes used # For pixel-style fonts that do not scale well, this ensures that font sizes used
# with this font will always be divisible by this value, in pixels. For instance, # with this font will always be divisible by this value, in pixels. For instance,

4
settings_modified_for_sussycraft.txt
View File

@ -2,7 +2,6 @@ settingtypes.txt:
fps_max (Maximum FPS) int 4294967295 1 4294967295 fps_max (Maximum FPS) int 4294967295 1 4294967295
vsync (VSync) bool true vsync (VSync) bool true
serverlist_url (Serverlist URL) string servers.cubesoftware.xyz <=== WARNING!! THERE ARE 2 THE SAME LINES FOR SOME REASON serverlist_url (Serverlist URL) string servers.cubesoftware.xyz <=== WARNING!! THERE ARE 2 THE SAME LINES FOR SOME REASON
font_size (Font size) int 32 5 72
font_path (Regular font path) filepath fonts/monogram-extended.ttf font_path (Regular font path) filepath fonts/monogram-extended.ttf
touchscreen_threshold (Touch screen threshold) int 5 0 100 touchscreen_threshold (Touch screen threshold) int 5 0 100
mouse_sensitivity (Mouse sensitivity) float 0.1 0.001 10.0 mouse_sensitivity (Mouse sensitivity) float 0.1 0.001 10.0
@ -13,9 +12,6 @@ settings->setDefault("smooth_lighting", "true"); // comment to be able to find t
settings->setDefault("fps_max", "4294967295"); // fps is "unlimited" because vsync is on settings->setDefault("fps_max", "4294967295"); // fps is "unlimited" because vsync is on
settings->setDefault("vsync", "true"); // comment to be able to find this line from settings_modified_for_sussycraft.txt settings->setDefault("vsync", "true"); // comment to be able to find this line from settings_modified_for_sussycraft.txt
settings->setDefault("serverlist_url", "servers.cubesoftware.xyz"); // comment to be able to find this line from settings_modified_for_sussycraft.txt settings->setDefault("serverlist_url", "servers.cubesoftware.xyz"); // comment to be able to find this line from settings_modified_for_sussycraft.txt
settings->setDefault("font_size", "32"); // comment to be able to find this line from settings_modified_for_sussycraft.txt (1)
settings->setDefault("font_size", "32"); // comment to be able to find this line from settings_modified_for_sussycraft.txt (2)
settings->setDefault("font_size", "32"); // comment to be able to find this line from settings_modified_for_sussycraft.txt (3)
settings->setDefault("font_path", porting::getDataPath("fonts" DIR_DELIM "monogram-extended.ttf")); // comment to be able to find this line from settings_modified_for_sussycraft.txt settings->setDefault("font_path", porting::getDataPath("fonts" DIR_DELIM "monogram-extended.ttf")); // comment to be able to find this line from settings_modified_for_sussycraft.txt
settings->setDefault("touchscreen_threshold","5"); // comment to be able to find this line from settings_modified_for_sussycraft.txt settings->setDefault("touchscreen_threshold","5"); // comment to be able to find this line from settings_modified_for_sussycraft.txt
settings->setDefault("menu_clouds", "false"); // comment to be able to find this line from settings_modified_for_sussycraft.txt settings->setDefault("menu_clouds", "false"); // comment to be able to find this line from settings_modified_for_sussycraft.txt

6
src/defaultsettings.cpp
View File

@ -502,15 +502,15 @@ void set_default_settings()
if (x_inches < 3.7f) { if (x_inches < 3.7f) {
settings->setDefault("hud_scaling", "0.6"); settings->setDefault("hud_scaling", "0.6");
settings->setDefault("font_size", "32"); // comment to be able to find this line from settings_modified_for_sussycraft.txt (1) settings->setDefault("font_size", "14");
settings->setDefault("mono_font_size", "14"); settings->setDefault("mono_font_size", "14");
} else if (x_inches < 4.5f) { } else if (x_inches < 4.5f) {
settings->setDefault("hud_scaling", "0.7"); settings->setDefault("hud_scaling", "0.7");
settings->setDefault("font_size", "32"); // comment to be able to find this line from settings_modified_for_sussycraft.txt (2) settings->setDefault("font_size", "14");
settings->setDefault("mono_font_size", "14"); settings->setDefault("mono_font_size", "14");
} else if (x_inches < 6.0f) { } else if (x_inches < 6.0f) {
settings->setDefault("hud_scaling", "0.85"); settings->setDefault("hud_scaling", "0.85");
settings->setDefault("font_size", "32"); // comment to be able to find this line from settings_modified_for_sussycraft.txt (3) settings->setDefault("font_size", "14");
settings->setDefault("mono_font_size", "14"); settings->setDefault("mono_font_size", "14");
} }
// Tablets >= 6.0 use non-Android defaults for these settings // Tablets >= 6.0 use non-Android defaults for these settings