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

Don't deactivate menu when a popup is active

Browse source
This commit is contained in:
Learath 2020-09-05 18:13:32 +03:00
parent b95ad532ee
commit 9e35752d1c
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1348,6 +1348,7 @@ int CMenus::Render()
{ {
Client()->DummyDisconnect(0); Client()->DummyDisconnect(0);
m_Popup = POPUP_NONE; m_Popup = POPUP_NONE;
SetActive(false);
} }
} }
else if(m_Popup == POPUP_PASSWORD) else if(m_Popup == POPUP_PASSWORD)
@ -2103,7 +2104,7 @@ void CMenus::OnRender()
void CMenus::RenderBackground() void CMenus::RenderBackground()
{ {
Graphics()->BlendNormal(); Graphics()->BlendNormal();
float sw = 300*Graphics()->ScreenAspect(); float sw = 300*Graphics()->ScreenAspect();
float sh = 300; float sh = 300;
Graphics()->MapScreen(0, 0, sw, sh); Graphics()->MapScreen(0, 0, sw, sh);

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

@ -83,9 +83,9 @@ void CMenus::RenderGame(CUIRect MainView)
else else
{ {
Client()->DummyDisconnect(0); Client()->DummyDisconnect(0);
SetActive(false);
} }
} }
SetActive(false);
} }
ButtonBar.VSplitRight(5.0f, &ButtonBar, 0); ButtonBar.VSplitRight(5.0f, &ButtonBar, 0);