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

Hide ghost menu buttons if there are no ghosts

Browse source
This commit is contained in:
Redix 2017-09-18 00:57:21 +02:00
parent 0b4d629dab
commit 0c6026c22e
3 changed files with 16 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -413,6 +413,7 @@ int CGhost::Load(const char *pFilename)
// select ghost
CGhostItem *pGhost = &m_aActiveGhosts[Slot];
pGhost->Reset();
pGhost->m_Path.SetSize(NumTicks);
str_copy(pGhost->m_aPlayer, pHeader->m_aOwner, sizeof(pGhost->m_aPlayer));
@ -421,7 +422,6 @@ int CGhost::Load(const char *pFilename)
bool FoundSkin = false;
bool NoTick = false;
bool Error = false;
pGhost->m_StartTick = -1;
int Type;
while(!Error && GhostLoader()->ReadNextType(&Type))

1
src/game/client/components/ghost.h
View file

@ -93,6 +93,7 @@ private:
void Reset()
{
m_Path.Reset();
m_StartTick = -1;
m_PlaybackPos = 0;
}
};

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

@ -1128,17 +1128,23 @@ void CMenus::RenderGhost(CUIRect MainView)
if(NewSelected != -1)
s_SelectedIndex = NewSelected;
CGhostItem *pGhost = &m_lGhosts[s_SelectedIndex];
RenderTools()->DrawUIRect(&Status, vec4(1,1,1,0.25f), CUI::CORNER_B, 5.0f);
Status.Margin(5.0f, &Status);
CUIRect Button;
Status.VSplitLeft(120.0f, &Button, &Status);
static int s_GhostButton = 0;
static int s_DeleteButton = 0;
static int s_SaveButton = 0;
static int s_ReloadButton = 0;
if(DoButton_Menu(&s_ReloadButton, Localize("Reload"), 0, &Button))
{
m_pClient->m_pGhost->UnloadAll();
GhostlistPopulate();
}
if(s_SelectedIndex >= m_lGhosts.size())
return;
CGhostItem *pGhost = &m_lGhosts[s_SelectedIndex];
CGhostItem *pOwnGhost = GetOwnGhost();
int ReservedSlots = !pGhost->m_Own && !(pOwnGhost && pOwnGhost->Active());
@ -1146,6 +1152,7 @@ void CMenus::RenderGhost(CUIRect MainView)
{
Status.VSplitRight(120.0f, &Status, &Button);
static int s_GhostButton = 0;
const char *pText = pGhost->Active() ? Localize("Deactivate") : Localize("Activate");
if(DoButton_Menu(&s_GhostButton, pText, 0, &Button) || (NewSelected != -1 && Input()->MouseDoubleClick()))
{
@ -1163,6 +1170,7 @@ void CMenus::RenderGhost(CUIRect MainView)
Status.VSplitRight(120.0f, &Status, &Button);
static int s_DeleteButton = 0;
if(DoButton_Menu(&s_DeleteButton, Localize("Delete"), 0, &Button))
{
if(pGhost->Active())
@ -1175,16 +1183,9 @@ void CMenus::RenderGhost(CUIRect MainView)
bool Recording = m_pClient->m_pGhost->GhostRecorder()->IsRecording();
if(!pGhost->HasFile() && !Recording && pGhost->Active())
{
static int s_SaveButton = 0;
Status.VSplitRight(120.0f, &Status, &Button);
if(DoButton_Menu(&s_SaveButton, Localize("Save"), 0, &Button))
m_pClient->m_pGhost->SaveGhost(pGhost);
}
Status.VSplitLeft(120.0f, &Button, &Status);
if(DoButton_Menu(&s_ReloadButton, Localize("Reload"), 0, &Button))
{
m_pClient->m_pGhost->UnloadAll();
GhostlistPopulate();
}
}