commit faf9296b

sago007 · 2020-06-28 08:31
faf9296b6c1ebc17057fc213ece2ba401718b68b patch · browse files
parent 409492c99f0a12516a6207a21fba96a5186f3b94

Made the first use of template for duplicated code

Changed files

M	source/code/HelpGamepadState.cpp before

diff --git a/source/code/HelpGamepadState.cpp b/source/code/HelpGamepadState.cpp index 6107e8b..5de5c25 100644 --- a/source/code/HelpGamepadState.cpp +++ b/source/code/HelpGamepadState.cpp

@@ -29,7 +29,7 @@ https://blockattack.net

const int buttonOffset = 160;

-static void setHelpGamepadFont(const sago::SagoDataHolder* holder, sago::SagoTextField& field, const char* text) {

+template<typename T> void setHelpGamepadFontTemplate(const sago::SagoDataHolder* holder, T& field, const char* text) {

field.SetHolder(holder);

field.SetFont("freeserif");

field.SetColor({255,255,255,255});

@@ -38,13 +38,12 @@ static void setHelpGamepadFont(const sago::SagoDataHolder* holder, sago::SagoTex

field.SetText(text);

}

+static void setHelpGamepadFont(const sago::SagoDataHolder* holder, sago::SagoTextField& field, const char* text) {

+ setHelpGamepadFontTemplate(holder, field, 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.SetFontSize(30);

- field.SetOutline(2, {0,0,0,255});

- field.SetText(text);

+ setHelpGamepadFontTemplate(holder, field, text);

}