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

Remove unnecessary client component variables and setters

Browse source 
Use the gameclient to access other components instead.
This commit is contained in:
Robert Müller 2024-03-30 17:45:58 +01:00
parent 2e211c9a31
commit 8817a69269
9 changed files with 21 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/game/client/components/menus.cpp
View file

@ -779,7 +779,7 @@ void CMenus::RenderLoading(const char *pCaption, const char *pContent, int Incre
Ui()->MapScreen(); Ui()->MapScreen();
if(!RenderMenuBackgroundMap || !m_pBackground->Render()) if(!RenderMenuBackgroundMap || !GameClient()->m_MenuBackground.Render())
{ {
RenderBackground(); RenderBackground();
} }
@ -811,7 +811,7 @@ void CMenus::RenderLoading(const char *pCaption, const char *pContent, int Incre
void CMenus::RenderNews(CUIRect MainView) void CMenus::RenderNews(CUIRect MainView)
{ {
m_pBackground->ChangePosition(CMenuBackground::POS_NEWS); GameClient()->m_MenuBackground.ChangePosition(CMenuBackground::POS_NEWS);
g_Config.m_UiUnreadNews = false; g_Config.m_UiUnreadNews = false;
@ -1069,7 +1069,7 @@ void CMenus::Render()
} }
else else
{ {
if(!m_pBackground->Render()) if(!GameClient()->m_MenuBackground.Render())
{ {
RenderBackground(); RenderBackground();
} }
@ -1977,7 +1977,7 @@ void CMenus::PopupConfirmDemoReplaceVideo()
void CMenus::RenderThemeSelection(CUIRect MainView) void CMenus::RenderThemeSelection(CUIRect MainView)
{ {
const std::vector<CTheme> &vThemes = m_pBackground->GetThemes(); const std::vector<CTheme> &vThemes = GameClient()->m_MenuBackground.GetThemes();
int SelectedTheme = -1; int SelectedTheme = -1;
for(int i = 0; i < (int)vThemes.size(); i++) for(int i = 0; i < (int)vThemes.size(); i++)
@ -2043,7 +2043,7 @@ void CMenus::RenderThemeSelection(CUIRect MainView)
{ {
const CTheme &Theme = vThemes[SelectedTheme]; const CTheme &Theme = vThemes[SelectedTheme];
str_copy(g_Config.m_ClMenuMap, Theme.m_Name.c_str()); str_copy(g_Config.m_ClMenuMap, Theme.m_Name.c_str());
m_pBackground->LoadMenuBackground(Theme.m_HasDay, Theme.m_HasNight); GameClient()->m_MenuBackground.LoadMenuBackground(Theme.m_HasDay, Theme.m_HasNight);
} }
} }

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

@ -591,13 +591,9 @@ protected:
bool CheckHotKey(int Key) const; bool CheckHotKey(int Key) const;
class CMenuBackground *m_pBackground;
public: public:
void RenderBackground(); void RenderBackground();
void SetMenuBackground(class CMenuBackground *pBackground) { m_pBackground = pBackground; }
static CMenusKeyBinder m_Binder; static CMenusKeyBinder m_Binder;
CMenus(); CMenus();

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

@ -1712,20 +1712,20 @@ void CMenus::RenderServerbrowser(CUIRect MainView)
switch(g_Config.m_UiPage) switch(g_Config.m_UiPage)
{ {
case PAGE_INTERNET: case PAGE_INTERNET:
m_pBackground->ChangePosition(CMenuBackground::POS_BROWSER_INTERNET); GameClient()->m_MenuBackground.ChangePosition(CMenuBackground::POS_BROWSER_INTERNET);
break; break;
case PAGE_LAN: case PAGE_LAN:
m_pBackground->ChangePosition(CMenuBackground::POS_BROWSER_LAN); GameClient()->m_MenuBackground.ChangePosition(CMenuBackground::POS_BROWSER_LAN);
break; break;
case PAGE_FAVORITES: case PAGE_FAVORITES:
m_pBackground->ChangePosition(CMenuBackground::POS_BROWSER_FAVORITES); GameClient()->m_MenuBackground.ChangePosition(CMenuBackground::POS_BROWSER_FAVORITES);
break; break;
case PAGE_FAVORITE_COMMUNITY_1: case PAGE_FAVORITE_COMMUNITY_1:
case PAGE_FAVORITE_COMMUNITY_2: case PAGE_FAVORITE_COMMUNITY_2:
case PAGE_FAVORITE_COMMUNITY_3: case PAGE_FAVORITE_COMMUNITY_3:
case PAGE_FAVORITE_COMMUNITY_4: case PAGE_FAVORITE_COMMUNITY_4:
case PAGE_FAVORITE_COMMUNITY_5: case PAGE_FAVORITE_COMMUNITY_5:
m_pBackground->ChangePosition(g_Config.m_UiPage - PAGE_FAVORITE_COMMUNITY_1 + CMenuBackground::POS_BROWSER_CUSTOM0); GameClient()->m_MenuBackground.ChangePosition(g_Config.m_UiPage - PAGE_FAVORITE_COMMUNITY_1 + CMenuBackground::POS_BROWSER_CUSTOM0);
break; break;
default: default:
dbg_assert(false, "ui_page invalid for RenderServerbrowser"); dbg_assert(false, "ui_page invalid for RenderServerbrowser");

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

@ -1058,7 +1058,7 @@ void CMenus::FetchAllHeaders()
void CMenus::RenderDemoBrowser(CUIRect MainView) void CMenus::RenderDemoBrowser(CUIRect MainView)
{ {
m_pBackground->ChangePosition(CMenuBackground::POS_DEMOS); GameClient()->m_MenuBackground.ChangePosition(CMenuBackground::POS_DEMOS);
CUIRect ListView, DetailsView, ButtonsView; CUIRect ListView, DetailsView, ButtonsView;
MainView.Draw(ms_ColorTabbarActive, IGraphics::CORNER_B, 10.0f); MainView.Draw(ms_ColorTabbarActive, IGraphics::CORNER_B, 10.0f);

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

@ -2058,52 +2058,52 @@ void CMenus::RenderSettings(CUIRect MainView)
if(g_Config.m_UiSettingsPage == SETTINGS_LANGUAGE) if(g_Config.m_UiSettingsPage == SETTINGS_LANGUAGE)
{ {
m_pBackground->ChangePosition(CMenuBackground::POS_SETTINGS_LANGUAGE); GameClient()->m_MenuBackground.ChangePosition(CMenuBackground::POS_SETTINGS_LANGUAGE);
RenderLanguageSelection(MainView); RenderLanguageSelection(MainView);
} }
else if(g_Config.m_UiSettingsPage == SETTINGS_GENERAL) else if(g_Config.m_UiSettingsPage == SETTINGS_GENERAL)
{ {
m_pBackground->ChangePosition(CMenuBackground::POS_SETTINGS_GENERAL); GameClient()->m_MenuBackground.ChangePosition(CMenuBackground::POS_SETTINGS_GENERAL);
RenderSettingsGeneral(MainView); RenderSettingsGeneral(MainView);
} }
else if(g_Config.m_UiSettingsPage == SETTINGS_PLAYER) else if(g_Config.m_UiSettingsPage == SETTINGS_PLAYER)
{ {
m_pBackground->ChangePosition(CMenuBackground::POS_SETTINGS_PLAYER); GameClient()->m_MenuBackground.ChangePosition(CMenuBackground::POS_SETTINGS_PLAYER);
RenderSettingsPlayer(MainView); RenderSettingsPlayer(MainView);
} }
else if(g_Config.m_UiSettingsPage == SETTINGS_TEE) else if(g_Config.m_UiSettingsPage == SETTINGS_TEE)
{ {
m_pBackground->ChangePosition(CMenuBackground::POS_SETTINGS_TEE); GameClient()->m_MenuBackground.ChangePosition(CMenuBackground::POS_SETTINGS_TEE);
RenderSettingsTee(MainView); RenderSettingsTee(MainView);
} }
else if(g_Config.m_UiSettingsPage == SETTINGS_APPEARANCE) else if(g_Config.m_UiSettingsPage == SETTINGS_APPEARANCE)
{ {
m_pBackground->ChangePosition(CMenuBackground::POS_SETTINGS_APPEARANCE); GameClient()->m_MenuBackground.ChangePosition(CMenuBackground::POS_SETTINGS_APPEARANCE);
RenderSettingsAppearance(MainView); RenderSettingsAppearance(MainView);
} }
else if(g_Config.m_UiSettingsPage == SETTINGS_CONTROLS) else if(g_Config.m_UiSettingsPage == SETTINGS_CONTROLS)
{ {
m_pBackground->ChangePosition(CMenuBackground::POS_SETTINGS_CONTROLS); GameClient()->m_MenuBackground.ChangePosition(CMenuBackground::POS_SETTINGS_CONTROLS);
RenderSettingsControls(MainView); RenderSettingsControls(MainView);
} }
else if(g_Config.m_UiSettingsPage == SETTINGS_GRAPHICS) else if(g_Config.m_UiSettingsPage == SETTINGS_GRAPHICS)
{ {
m_pBackground->ChangePosition(CMenuBackground::POS_SETTINGS_GRAPHICS); GameClient()->m_MenuBackground.ChangePosition(CMenuBackground::POS_SETTINGS_GRAPHICS);
RenderSettingsGraphics(MainView); RenderSettingsGraphics(MainView);
} }
else if(g_Config.m_UiSettingsPage == SETTINGS_SOUND) else if(g_Config.m_UiSettingsPage == SETTINGS_SOUND)
{ {
m_pBackground->ChangePosition(CMenuBackground::POS_SETTINGS_SOUND); GameClient()->m_MenuBackground.ChangePosition(CMenuBackground::POS_SETTINGS_SOUND);
RenderSettingsSound(MainView); RenderSettingsSound(MainView);
} }
else if(g_Config.m_UiSettingsPage == SETTINGS_DDNET) else if(g_Config.m_UiSettingsPage == SETTINGS_DDNET)
{ {
m_pBackground->ChangePosition(CMenuBackground::POS_SETTINGS_DDNET); GameClient()->m_MenuBackground.ChangePosition(CMenuBackground::POS_SETTINGS_DDNET);
RenderSettingsDDNet(MainView); RenderSettingsDDNet(MainView);
} }
else if(g_Config.m_UiSettingsPage == SETTINGS_ASSETS) else if(g_Config.m_UiSettingsPage == SETTINGS_ASSETS)
{ {
m_pBackground->ChangePosition(CMenuBackground::POS_SETTINGS_ASSETS); GameClient()->m_MenuBackground.ChangePosition(CMenuBackground::POS_SETTINGS_ASSETS);
RenderSettingsCustom(MainView); RenderSettingsCustom(MainView);
} }
else else

2
src/game/client/components/menus_start.cpp
View file

@ -19,7 +19,7 @@
void CMenus::RenderStartMenu(CUIRect MainView) void CMenus::RenderStartMenu(CUIRect MainView)
{ {
m_pBackground->ChangePosition(CMenuBackground::POS_START); GameClient()->m_MenuBackground.ChangePosition(CMenuBackground::POS_START);
// render logo // render logo
Graphics()->TextureSet(g_pData->m_aImages[IMAGE_BANNER].m_Id); Graphics()->TextureSet(g_pData->m_aImages[IMAGE_BANNER].m_Id);

5
src/game/client/components/nameplates.cpp
View file

@ -347,11 +347,6 @@ void CNamePlates::OnRender()
} }
} }
void CNamePlates::SetPlayers(CPlayers *pPlayers)
{
m_pPlayers = pPlayers;
}
void CNamePlates::ResetNamePlates() void CNamePlates::ResetNamePlates()
{ {
for(auto &NamePlate : m_aNamePlates) for(auto &NamePlate : m_aNamePlates)

3
src/game/client/components/nameplates.h
View file

@ -49,7 +49,6 @@ class CNamePlates : public CComponent
void RenderNameplatePos(vec2 Position, const CNetObj_PlayerInfo *pPlayerInfo, float Alpha, bool ForceAlpha = false); void RenderNameplatePos(vec2 Position, const CNetObj_PlayerInfo *pPlayerInfo, float Alpha, bool ForceAlpha = false);
SPlayerNamePlate m_aNamePlates[MAX_CLIENTS]; SPlayerNamePlate m_aNamePlates[MAX_CLIENTS];
class CPlayers *m_pPlayers;
void ResetNamePlates(); void ResetNamePlates();
@ -60,8 +59,6 @@ public:
virtual void OnWindowResize() override; virtual void OnWindowResize() override;
virtual void OnInit() override; virtual void OnInit() override;
virtual void OnRender() override; virtual void OnRender() override;
void SetPlayers(class CPlayers *pPlayers);
}; };
#endif #endif

4
src/game/client/gameclient.cpp
View file

@ -102,10 +102,6 @@ void CGameClient::OnConsoleInit()
#endif #endif
m_pHttp = Kernel()->RequestInterface<IHttp>(); m_pHttp = Kernel()->RequestInterface<IHttp>();
m_Menus.SetMenuBackground(&m_MenuBackground);
m_NamePlates.SetPlayers(&m_Players);
// make a list of all the systems, make sure to add them in the correct render order // make a list of all the systems, make sure to add them in the correct render order
m_vpAll.insert(m_vpAll.end(), {&m_Skins, m_vpAll.insert(m_vpAll.end(), {&m_Skins,
&m_CountryFlags, &m_CountryFlags,