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

Merge #3015

Browse source 
3015: Allow quitting instantly with SDL_QUIT when non-warning dialog showing r=Jupeyy a=def-



Co-authored-by: def <dennis@felsin9.de>
This commit is contained in:
bors[bot] 2020-10-06 00:33:04 +00:00 committed by GitHub
parent 75bdcce3ce 1a83651cf1
commit ecb5e4c790
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/engine/client.h
View file

@ -253,6 +253,7 @@ public:
virtual void OnDummyDisconnect() = 0;
virtual void Echo(const char *pString) = 0;
virtual bool CanDisplayWarning() = 0;
virtual bool IsDisplayingWarning() = 0;
};
extern IGameClient *CreateGameClient();

2
src/engine/client/client.cpp
View file

@ -3327,7 +3327,7 @@ void CClient::Run()
s_SavedConfig = true;
}
if(m_Warnings.empty() && GameClient()->CanDisplayWarning())
if(m_Warnings.empty() && !GameClient()->IsDisplayingWarning())
break;
}

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

@ -2705,3 +2705,8 @@ bool CGameClient::CanDisplayWarning()
{
return m_pMenus->CanDisplayWarning();
}
bool CGameClient::IsDisplayingWarning()
{
return m_pMenus->GetCurPopup() == CMenus::POPUP_WARNING;
}

1
src/game/client/gameclient.h
View file

@ -450,6 +450,7 @@ public:
void Echo(const char *pString);
bool IsOtherTeam(int ClientID);
bool CanDisplayWarning();
bool IsDisplayingWarning();
void LoadGameSkin(const char *pPath, bool AsDir = false);
void LoadEmoticonsSkin(const char *pPath, bool AsDir = false);