gptbot/0ad
1
0
Fork 0
forked from mirrors/0ad
Code Pull Requests Activity

Move static GUI<>::GetSetting operating on IGUIObject member to a IGUIObject member function, grouping it with SettingExists and AddSetting.

Browse Source 
Differential Revision: https://code.wildfiregames.com/D2230
Tested on: gcc 9.1.0, Jenkins

This was SVN commit r22789.
This commit is contained in:
elexis
2019-08-26 12:25:07 +00:00
parent 85d01b839c
commit 92b6cdfeab
21 changed files with 273 additions and 259 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/gui/CGUIText.cpp
+1 -1
View File
@@ -80,7 +80,7 @@ CGUIText::CGUIText(const CGUI& pGUI, const CGUIString& string, const CStrW& Font
// to run through the TextCalls a second time in the CalculateTextPosition method again
EAlign align = EAlign_Left;
if (pObject->SettingExists("text_align"))
align = GUI<EAlign>::GetSetting(pObject, "text_align");
align = pObject->GetSetting<EAlign>("text_align");
// Go through string word by word
for (int i = 0; i < static_cast<int>(string.m_Words.size()) - 1; ++i)