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

Change ingame menu layout a bit: Browser, Ghost directly instead of Network tab

Browse source
This commit is contained in:
def 2016-04-27 20:14:03 +02:00
parent b495b1681c
commit ec7d28ed86
3 changed files with 15 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -86,8 +86,6 @@ CMenus::CMenus()
m_FriendlistSelectedIndex = -1; m_FriendlistSelectedIndex = -1;
m_DoubleClickIndex = -1; m_DoubleClickIndex = -1;
m_DDRacePage = PAGE_BROWSER;
m_DemoPlayerState = DEMOPLAYER_NONE; m_DemoPlayerState = DEMOPLAYER_NONE;
m_Dummy = false; m_Dummy = false;
} }
@ -667,10 +665,15 @@ int CMenus::RenderMenubar(CUIRect r)
if(DoButton_MenuTab(&s_ServerInfoButton, Localize("Server info"), m_ActivePage==PAGE_SERVER_INFO, &Button, 0)) if(DoButton_MenuTab(&s_ServerInfoButton, Localize("Server info"), m_ActivePage==PAGE_SERVER_INFO, &Button, 0))
NewPage = PAGE_SERVER_INFO; NewPage = PAGE_SERVER_INFO;
Box.VSplitLeft(100.0f, &Button, &Box); Box.VSplitLeft(90.0f, &Button, &Box);
static int s_NetworkButton=0;
if(DoButton_MenuTab(&s_NetworkButton, Localize("Browser"), m_ActivePage==PAGE_NETWORK, &Button, 0))
NewPage = PAGE_NETWORK;
Box.VSplitLeft(70.0f, &Button, &Box);
static int s_GhostButton=0; static int s_GhostButton=0;
if(DoButton_MenuTab(&s_GhostButton, "Network", m_ActivePage==PAGE_DDRace, &Button, 0)) if(DoButton_MenuTab(&s_GhostButton, Localize("Ghost"), m_ActivePage==PAGE_GHOST, &Button, 0))
NewPage = PAGE_DDRace; NewPage = PAGE_GHOST;
Box.VSplitLeft(100.0f, &Button, &Box); Box.VSplitLeft(100.0f, &Button, &Box);
Box.VSplitLeft(4.0f, 0, &Box); Box.VSplitLeft(4.0f, 0, &Box);
@ -955,16 +958,16 @@ int CMenus::Render()
RenderPlayers(MainView); RenderPlayers(MainView);
else if(m_GamePage == PAGE_SERVER_INFO) else if(m_GamePage == PAGE_SERVER_INFO)
RenderServerInfo(MainView); RenderServerInfo(MainView);
else if(m_GamePage == PAGE_DDRace) else if(m_GamePage == PAGE_NETWORK)
RenderInGameDDRace(MainView); RenderInGameNetwork(MainView);
else if(m_GamePage == PAGE_GHOST)
RenderGhost(MainView);
else if(m_GamePage == PAGE_CALLVOTE) else if(m_GamePage == PAGE_CALLVOTE)
RenderServerControl(MainView); RenderServerControl(MainView);
else if(m_GamePage == PAGE_SETTINGS) else if(m_GamePage == PAGE_SETTINGS)
RenderSettings(MainView); RenderSettings(MainView);
else if(m_GamePage == PAGE_GHOST) else if(m_GamePage == PAGE_GHOST)
RenderGhost(MainView); RenderGhost(MainView);
else if(m_GamePage == PAGE_BROWSER)
RenderInGameBrowser(MainView);
} }
else if(g_Config.m_UiPage == PAGE_NEWS) else if(g_Config.m_UiPage == PAGE_NEWS)
RenderNews(MainView); RenderNews(MainView);

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

@ -314,8 +314,7 @@ public:
PAGE_DEMOS, PAGE_DEMOS,
PAGE_SETTINGS, PAGE_SETTINGS,
PAGE_SYSTEM, PAGE_SYSTEM,
PAGE_DDRace, PAGE_NETWORK,
PAGE_BROWSER,
PAGE_GHOST PAGE_GHOST
}; };
@ -343,7 +342,6 @@ public:
sorted_array<CGhostItem> m_lGhosts; sorted_array<CGhostItem> m_lGhosts;
CGhostItem *m_OwnGhost; CGhostItem *m_OwnGhost;
int m_DDRacePage;
void GhostlistPopulate(); void GhostlistPopulate();
void setPopup(int Popup) { m_Popup = Popup; } void setPopup(int Popup) { m_Popup = Popup; }
@ -378,9 +376,8 @@ private:
static int GhostlistFetchCallback(const char *pName, int IsDir, int StorageType, void *pUser); static int GhostlistFetchCallback(const char *pName, int IsDir, int StorageType, void *pUser);
// found in menus_ingame.cpp // found in menus_ingame.cpp
void RenderInGameDDRace(CUIRect MainView); void RenderInGameNetwork(CUIRect MainView);
void RenderGhost(CUIRect MainView); void RenderGhost(CUIRect MainView);
void RenderInGameBrowser(CUIRect MainView);
// found in menus_settings.cpp // found in menus_settings.cpp
void RenderSettingsDDRace(CUIRect MainView); void RenderSettingsDDRace(CUIRect MainView);

39
src/game/client/components/menus_ingame.cpp
View file

@ -762,44 +762,7 @@ void CMenus::RenderServerControl(CUIRect MainView)
} }
} }
void CMenus::RenderInGameDDRace(CUIRect MainView) void CMenus::RenderInGameNetwork(CUIRect MainView)
{
CUIRect Box = MainView;
CUIRect Button;
RenderTools()->DrawUIRect(&MainView, ms_ColorTabbarActive, CUI::CORNER_ALL, 10.0f);
Box.HSplitTop(5.0f, &MainView, &MainView);
Box.HSplitTop(24.0f, &Box, &MainView);
Box.VMargin(20.0f, &Box);
Box.VSplitLeft(100.0f, &Button, &Box);
static int s_BrwoserButton=0;
if(DoButton_MenuTab(&s_BrwoserButton, Localize("Browser"), m_DDRacePage==PAGE_BROWSER, &Button, CUI::CORNER_TL))
{
m_DDRacePage = PAGE_BROWSER;
}
//Box.VSplitLeft(4.0f, 0, &Box);
Box.VSplitLeft(80.0f, &Button, &Box);
static int s_GhostButton=0;
if(DoButton_MenuTab(&s_GhostButton, Localize("Ghost"), m_DDRacePage==PAGE_GHOST, &Button, 0))
{
m_DDRacePage = PAGE_GHOST;
}
if(m_DDRacePage != -1)
{
if(m_DDRacePage == PAGE_GHOST)
RenderGhost(MainView);
else
RenderInGameBrowser(MainView);
}
return;
}
void CMenus::RenderInGameBrowser(CUIRect MainView)
{ {
CUIRect Box = MainView; CUIRect Box = MainView;
CUIRect Button; CUIRect Button;