diff --git a/source/code/HelpAboutState.cpp b/source/code/HelpAboutState.cpp index c00ab6d..eef7557 100644 --- a/source/code/HelpAboutState.cpp +++ b/source/code/HelpAboutState.cpp @@ -21,6 +21,7 @@ https://blockattack.net =========================================================================== */ +#include "HelpCommon.hpp" #include "HelpAboutState.hpp" #include "global.hpp" #include "common.h" @@ -43,15 +44,7 @@ static void setHelpGamepadFont(const sago::SagoDataHolder* holder, sago::SagoTex field.SetText(text); } -static void setHelpGamepadFont(const sago::SagoDataHolder* holder, sago::SagoTextBox& field, const char* text) { - field.SetHolder(holder); - field.SetFont("freeserif"); - field.SetColor({255,255,255,255}); - field.SetColor({0,0,0,255}); - field.SetFontSize(20); - field.SetOutline(0, {0,0,0,255}); - field.SetText(text); -} + @@ -80,7 +73,7 @@ HelpAboutState::HelpAboutState() { infoStream << _("Save folder:") << " " << PHYSFS_getWriteDir() << "\n"; infoStream << _("Locale:") << " " << setlocale( LC_CTYPE, nullptr ) << "\n"; setHelpGamepadFont(&globalData.spriteHolder->GetDataHolder(), titleField, _("About")); - setHelpGamepadFont(&globalData.spriteHolder->GetDataHolder(), infoBox, infoStream.str().c_str()); + setHelpBoxFont(&globalData.spriteHolder->GetDataHolder(), infoBox, infoStream.str().c_str()); sago::WriteFileContent("about.txt", infoStream.str()); } diff --git a/source/code/HelpCommon.cpp b/source/code/HelpCommon.cpp index cede2d9..7fc3ead 100644 --- a/source/code/HelpCommon.cpp +++ b/source/code/HelpCommon.cpp @@ -41,3 +41,13 @@ void setHelp30Font(const sago::SagoDataHolder* holder, sago::SagoTextField& fiel void setHelp30Font(const sago::SagoDataHolder* holder, sago::SagoTextBox& field, const char* text) { setHelp30FontTemplate(holder, field, text); } + +void setHelpBoxFont(const sago::SagoDataHolder* holder, sago::SagoTextBox& field, const char* text) { + field.SetHolder(holder); + field.SetFont("freeserif"); + field.SetColor({255,255,255,255}); + field.SetColor({0,0,0,255}); + field.SetFontSize(20); + field.SetOutline(0, {0,0,0,255}); + field.SetText(text); +} diff --git a/source/code/HelpCommon.hpp b/source/code/HelpCommon.hpp index 5af3a75..5746155 100644 --- a/source/code/HelpCommon.hpp +++ b/source/code/HelpCommon.hpp @@ -27,3 +27,5 @@ https://blockattack.net void setHelp30Font(const sago::SagoDataHolder* holder, sago::SagoTextField& field, const char* text); void setHelp30Font(const sago::SagoDataHolder* holder, sago::SagoTextBox& field, const char* text); + +void setHelpBoxFont(const sago::SagoDataHolder* holder, sago::SagoTextBox& field, const char* text); diff --git a/source/code/ShowFileState.cpp b/source/code/ShowFileState.cpp index 8aaae2d..e80e446 100644 --- a/source/code/ShowFileState.cpp +++ b/source/code/ShowFileState.cpp @@ -17,6 +17,7 @@ https://blockattack.net =========================================================================== */ +#include "HelpCommon.hpp" #include "ShowFileState.hpp" #include "global.hpp" #include "common.h" @@ -34,20 +35,10 @@ static void setHelpGamepadFont(const sago::SagoDataHolder* holder, sago::SagoTex field.SetText(text); } -static void setHelpGamepadFont(const sago::SagoDataHolder* holder, sago::SagoTextBox& field, const char* text) { - field.SetHolder(holder); - field.SetFont("freeserif"); - field.SetColor({255,255,255,255}); - field.SetColor({0,0,0,255}); - field.SetFontSize(20); - field.SetOutline(0, {0,0,0,255}); - field.SetText(text); -} - ShowFileState::ShowFileState() { setHelpGamepadFont(&globalData.spriteHolder->GetDataHolder(), titleField, ""); - setHelpGamepadFont(&globalData.spriteHolder->GetDataHolder(), infoBox, ""); - setHelpGamepadFont(&globalData.spriteHolder->GetDataHolder(), filenameField, ""); + setHelpBoxFont(&globalData.spriteHolder->GetDataHolder(), infoBox, ""); + setHelpBoxFont(&globalData.spriteHolder->GetDataHolder(), filenameField, ""); } ShowFileState::~ShowFileState() { @@ -104,4 +95,4 @@ void ShowFileState::Update() { } } -} \ No newline at end of file +}