edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-09-20 01:24:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename UiDoGetButtons to DoSettingsControlsButtons

Browse source
This commit is contained in:
Robert Müller 2022-05-13 21:23:10 +02:00
parent 60347fde1a
commit 8c7cdb5936
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/game/client/components/menus.h
View file

@ -97,7 +97,7 @@ class CMenus : public CComponent
void DoButton_KeySelect(const void *pID, const char *pText, int Checked, const CUIRect *pRect);
int DoKeyReader(void *pID, const CUIRect *pRect, int Key, int ModifierCombination, int *NewModifierCombination);
void UiDoGetButtons(int Start, int Stop, CUIRect View, CUIRect ScopeView);
void DoSettingsControlsButtons(int Start, int Stop, CUIRect View, CUIRect ScopeView);
void RenderColorPicker();

14
src/game/client/components/menus_settings.cpp
View file

@ -930,7 +930,7 @@ static CKeyInfo gs_aKeys[] =
Localize("Lock team");Localize("Show entities");Localize("Show HUD");Localize("Chat command");
*/
void CMenus::UiDoGetButtons(int Start, int Stop, CUIRect View, CUIRect ScopeView)
void CMenus::DoSettingsControlsButtons(int Start, int Stop, CUIRect View, CUIRect ScopeView)
{
for(int i = Start; i < Stop; i++)
{
@ -1035,7 +1035,7 @@ void CMenus::RenderSettingsControls(CUIRect MainView)
MovementSettings.HSplitTop(20.0f, 0, &MovementSettings);
}
UiDoGetButtons(0, 15, MovementSettings, MainView);
DoSettingsControlsButtons(0, 15, MovementSettings, MainView);
}
// weapon settings
@ -1048,7 +1048,7 @@ void CMenus::RenderSettingsControls(CUIRect MainView)
TextRender()->Text(0, WeaponSettings.x, WeaponSettings.y + (14.0f + 5.0f + 10.0f - 14.0f * UI()->Scale()) / 2.f, 14.0f * UI()->Scale(), Localize("Weapon"), -1.0f);
WeaponSettings.HSplitTop(14.0f + 5.0f + 10.0f, 0, &WeaponSettings);
UiDoGetButtons(15, 22, WeaponSettings, MainView);
DoSettingsControlsButtons(15, 22, WeaponSettings, MainView);
}
// defaults
@ -1074,7 +1074,7 @@ void CMenus::RenderSettingsControls(CUIRect MainView)
TextRender()->Text(0, VotingSettings.x, VotingSettings.y + (14.0f + 5.0f + 10.0f - 14.0f * UI()->Scale()) / 2.f, 14.0f * UI()->Scale(), Localize("Voting"), -1.0f);
VotingSettings.HSplitTop(14.0f + 5.0f + 10.0f, 0, &VotingSettings);
UiDoGetButtons(22, 24, VotingSettings, MainView);
DoSettingsControlsButtons(22, 24, VotingSettings, MainView);
}
// chat settings
@ -1087,7 +1087,7 @@ void CMenus::RenderSettingsControls(CUIRect MainView)
TextRender()->Text(0, ChatSettings.x, ChatSettings.y + (14.0f + 5.0f + 10.0f - 14.0f * UI()->Scale()) / 2.f, 14.0f * UI()->Scale(), Localize("Chat"), -1.0f);
ChatSettings.HSplitTop(14.0f + 5.0f + 10.0f, 0, &ChatSettings);
UiDoGetButtons(24, 29, ChatSettings, MainView);
DoSettingsControlsButtons(24, 29, ChatSettings, MainView);
}
// dummy settings
@ -1100,7 +1100,7 @@ void CMenus::RenderSettingsControls(CUIRect MainView)
TextRender()->Text(0, DummySettings.x, DummySettings.y + (14.0f + 5.0f + 10.0f - 14.0f * UI()->Scale()) / 2.f, 14.0f * UI()->Scale(), Localize("Dummy"), -1.0f);
DummySettings.HSplitTop(14.0f + 5.0f + 10.0f, 0, &DummySettings);
UiDoGetButtons(29, 32, DummySettings, MainView);
DoSettingsControlsButtons(29, 32, DummySettings, MainView);
}
// misc settings
@ -1113,7 +1113,7 @@ void CMenus::RenderSettingsControls(CUIRect MainView)
TextRender()->Text(0, MiscSettings.x, MiscSettings.y + (14.0f + 5.0f + 10.0f - 14.0f * UI()->Scale()) / 2.f, 14.0f * UI()->Scale(), Localize("Miscellaneous"), -1.0f);
MiscSettings.HSplitTop(14.0f + 5.0f + 10.0f, 0, &MiscSettings);
UiDoGetButtons(32, 44, MiscSettings, MainView);
DoSettingsControlsButtons(32, 44, MiscSettings, MainView);
}
UiDoListboxEnd(&s_ScrollValue, 0);