github/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-08-20 21:33:40 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Made Fipps larger

Browse source
This commit is contained in:
nclok1405 2025-07-02 16:45:32 +09:00
commit ea1c741fe7
2 changed files with 13 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

11
soh/soh/OTRGlobals.cpp
View file

@ -345,15 +345,16 @@ void OTRGlobals::Initialize() {
context->InitWindow(sohFast3dWindow); context->InitWindow(sohFast3dWindow);
auto overlay = context->GetInstance()->GetWindow()->GetGui()->GetGameOverlay(); auto overlay = context->GetInstance()->GetWindow()->GetGui()->GetGameOverlay();
// Currently, differently sized fonts require preloading (reloading font at runtime crashes the game) // Currently, differently sized fonts require preloading
// (loading a font at any point after here crashes the game with "INVALID ACCESS TO STORAGE")
overlay->LoadFont("Press Start 2P", 12.0f, "fonts/PressStart2P-Regular.ttf"); overlay->LoadFont("Press Start 2P", 12.0f, "fonts/PressStart2P-Regular.ttf");
overlay->LoadFont("Press Start 2P Normal", 24.0f, "fonts/PressStart2P-Regular.ttf"); overlay->LoadFont("Press Start 2P Normal", 24.0f, "fonts/PressStart2P-Regular.ttf");
overlay->LoadFont("Press Start 2P Large", 32.0f, "fonts/PressStart2P-Regular.ttf"); overlay->LoadFont("Press Start 2P Large", 32.0f, "fonts/PressStart2P-Regular.ttf");
overlay->LoadFont("Press Start 2P X-Large", 40.0f, "fonts/PressStart2P-Regular.ttf"); overlay->LoadFont("Press Start 2P X-Large", 40.0f, "fonts/PressStart2P-Regular.ttf");
overlay->LoadFont("Fipps", 24.0f, "fonts/Fipps-Regular.otf"); overlay->LoadFont("Fipps", 32.0f, "fonts/Fipps-Regular.otf");
overlay->LoadFont("Fipps Normal", 32.0f, "fonts/Fipps-Regular.otf"); overlay->LoadFont("Fipps Normal", 40.0f, "fonts/Fipps-Regular.otf");
overlay->LoadFont("Fipps Large", 40.0f, "fonts/Fipps-Regular.otf"); overlay->LoadFont("Fipps Large", 48.0f, "fonts/Fipps-Regular.otf");
overlay->LoadFont("Fipps X-Large", 48.0f, "fonts/Fipps-Regular.otf"); overlay->LoadFont("Fipps X-Large", 52.0f, "fonts/Fipps-Regular.otf");
LoadOverlayTextFont(); LoadOverlayTextFont();
context->InitAudio({ .SampleRate = 32000, .SampleLength = 1024, .DesiredBuffered = 1680 }); context->InitAudio({ .SampleRate = 32000, .SampleLength = 1024, .DesiredBuffered = 1680 });

13
soh/soh/SohGui/SohMenuSettings.cpp
View file

@ -514,12 +514,13 @@ void SohMenu::AddMenuSettings() {
AddWidget(path, "Overlay Text Font:", WIDGET_CVAR_COMBOBOX) AddWidget(path, "Overlay Text Font:", WIDGET_CVAR_COMBOBOX)
.CVar(CVAR_SETTING("OverlayTextFont")) .CVar(CVAR_SETTING("OverlayTextFont"))
.RaceDisable(false) .RaceDisable(false)
.Options(ComboboxOptions() .Options(
.ComboMap(overlayTextFontOptions) ComboboxOptions()
.Tooltip("Changes the font type of Overlay Text.") .ComboMap(overlayTextFontOptions)
.DefaultIndex(0) .Tooltip("Changes the font type of Overlay Text.\nNote: Fipps is generally smaller than Press Start 2P")
.ComponentAlignment(ComponentAlignments::Right) .DefaultIndex(0)
.LabelPosition(LabelPositions::Far)) .ComponentAlignment(ComponentAlignments::Right)
.LabelPosition(LabelPositions::Far))
.Callback([](WidgetInfo& info) { OTRGlobals::Instance->LoadOverlayTextFont(); }); .Callback([](WidgetInfo& info) { OTRGlobals::Instance->LoadOverlayTextFont(); });
AddWidget(path, "Test Overlay Text", WIDGET_BUTTON) AddWidget(path, "Test Overlay Text", WIDGET_BUTTON)
.RaceDisable(false) .RaceDisable(false)