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

Remove unused members CColumn::m_Flags

Browse source
This commit is contained in:
Robert Müller 2022-10-30 13:05:44 +01:00
parent 554fc19be0
commit 78876abd46
2 changed files with 14 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/game/client/components/menus_browser.cpp
View file

@ -69,16 +69,12 @@ void CMenus::RenderServerbrowserServerList(CUIRect View)
CLocConstString m_Caption; CLocConstString m_Caption;
int m_Direction; int m_Direction;
float m_Width; float m_Width;
int m_Flags;
CUIRect m_Rect; CUIRect m_Rect;
CUIRect m_Spacer; CUIRect m_Spacer;
}; };
enum enum
{ {
FIXED = 1,
SPACER = 2,
COL_FLAG_LOCK = 0, COL_FLAG_LOCK = 0,
COL_FLAG_FAV, COL_FLAG_FAV,
COL_FLAG_OFFICIAL, COL_FLAG_OFFICIAL,
@ -91,16 +87,16 @@ void CMenus::RenderServerbrowserServerList(CUIRect View)
}; };
CColumn s_aCols[] = { CColumn s_aCols[] = {
{-1, -1, " ", -1, 2.0f, 0, {0}, {0}}, {-1, -1, " ", -1, 2.0f, {0}, {0}},
{COL_FLAG_LOCK, -1, " ", -1, 14.0f, 0, {0}, {0}}, {COL_FLAG_LOCK, -1, " ", -1, 14.0f, {0}, {0}},
{COL_FLAG_FAV, -1, " ", -1, 14.0f, 0, {0}, {0}}, {COL_FLAG_FAV, -1, " ", -1, 14.0f, {0}, {0}},
{COL_FLAG_OFFICIAL, -1, " ", -1, 14.0f, 0, {0}, {0}}, {COL_FLAG_OFFICIAL, -1, " ", -1, 14.0f, {0}, {0}},
{COL_NAME, IServerBrowser::SORT_NAME, "Name", 0, 50.0f, 0, {0}, {0}}, // Localize - these strings are localized within CLocConstString {COL_NAME, IServerBrowser::SORT_NAME, "Name", 0, 50.0f, {0}, {0}}, // Localize - these strings are localized within CLocConstString
{COL_GAMETYPE, IServerBrowser::SORT_GAMETYPE, "Type", 1, 50.0f, 0, {0}, {0}}, {COL_GAMETYPE, IServerBrowser::SORT_GAMETYPE, "Type", 1, 50.0f, {0}, {0}},
{COL_MAP, IServerBrowser::SORT_MAP, "Map", 1, 120.0f + (Headers.w - 480) / 8, 0, {0}, {0}}, {COL_MAP, IServerBrowser::SORT_MAP, "Map", 1, 120.0f + (Headers.w - 480) / 8, {0}, {0}},
{COL_PLAYERS, IServerBrowser::SORT_NUMPLAYERS, "Players", 1, 85.0f, 0, {0}, {0}}, {COL_PLAYERS, IServerBrowser::SORT_NUMPLAYERS, "Players", 1, 85.0f, {0}, {0}},
{-1, -1, " ", 1, 10.0f, 0, {0}, {0}}, {-1, -1, " ", 1, 10.0f, {0}, {0}},
{COL_PING, IServerBrowser::SORT_PING, "Ping", 1, 40.0f, FIXED, {0}, {0}}, {COL_PING, IServerBrowser::SORT_PING, "Ping", 1, 40.0f, {0}, {0}},
}; };
// This is just for scripts/update_localization.py to work correctly (all other strings are already Localize()'d somewhere else). Don't remove! // This is just for scripts/update_localization.py to work correctly (all other strings are already Localize()'d somewhere else). Don't remove!
// Localize("Type"); // Localize("Type");
@ -116,7 +112,6 @@ void CMenus::RenderServerbrowserServerList(CUIRect View)
if(i + 1 < NumCols) if(i + 1 < NumCols)
{ {
//Cols[i].flags |= SPACER;
Headers.VSplitLeft(2, &s_aCols[i].m_Spacer, &Headers); Headers.VSplitLeft(2, &s_aCols[i].m_Spacer, &Headers);
} }
} }

9
src/game/client/components/menus_demo.cpp
View file

@ -1081,7 +1081,6 @@ void CMenus::RenderDemoList(CUIRect MainView)
CLocConstString m_Caption; CLocConstString m_Caption;
int m_Direction; int m_Direction;
float m_Width; float m_Width;
int m_Flags;
CUIRect m_Rect; CUIRect m_Rect;
CUIRect m_Spacer; CUIRect m_Spacer;
}; };
@ -1095,10 +1094,10 @@ void CMenus::RenderDemoList(CUIRect MainView)
}; };
static CColumn s_aCols[] = { static CColumn s_aCols[] = {
{COL_DEMONAME, SORT_DEMONAME, "Demo", 0, 0.0f, 0, {0}, {0}}, {COL_DEMONAME, SORT_DEMONAME, "Demo", 0, 0.0f, {0}, {0}},
{COL_MARKERS, SORT_MARKERS, "Markers", 1, 75.0f, 0, {0}, {0}}, {COL_MARKERS, SORT_MARKERS, "Markers", 1, 75.0f, {0}, {0}},
{COL_LENGTH, SORT_LENGTH, "Length", 1, 75.0f, 0, {0}, {0}}, {COL_LENGTH, SORT_LENGTH, "Length", 1, 75.0f, {0}, {0}},
{COL_DATE, SORT_DATE, "Date", 1, 160.0f, 1, {0}, {0}}, {COL_DATE, SORT_DATE, "Date", 1, 160.0f, {0}, {0}},
}; };
/* This is just for scripts/update_localization.py to work correctly. Don't remove! /* This is just for scripts/update_localization.py to work correctly. Don't remove!
Localize("Demo");Localize("Markers");Localize("Length");Localize("Date"); Localize("Demo");Localize("Markers");Localize("Length");Localize("Date");