edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-09-20 17:44:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of http://github.com/oy/teeworlds

Browse source 
and fixed Conflicts:
	src/engine/server/register.h
	src/game/server/gamemodes/mod.cpp

Signed-off-by: GreYFoXGTi <GreYFoXGTi@Gmail.com>
This commit is contained in:
GreYFoXGTi 2010-08-15 20:46:02 +03:00
parent a91d7cfd1f 02c7e3642a
commit 01cc3f4d68
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1269,7 +1269,7 @@ void CClient::PumpNetwork()
if(State() != IClient::STATE_DEMOPLAYBACK) if(State() != IClient::STATE_DEMOPLAYBACK)
{ {
// check for errors // check for errors
if(State() != IClient::STATE_OFFLINE && m_NetClient.State() == NETSTATE_OFFLINE) if(State() != IClient::STATE_OFFLINE && State() != IClient::STATE_QUITING && m_NetClient.State() == NETSTATE_OFFLINE)
{ {
SetState(IClient::STATE_OFFLINE); SetState(IClient::STATE_OFFLINE);
Disconnect(); Disconnect();
@ -1922,8 +1922,8 @@ void CClient::RegisterCommands()
m_pConsole->Register("stoprecord", "", CFGFLAG_SERVER, 0, 0, "Stop recording"); m_pConsole->Register("stoprecord", "", CFGFLAG_SERVER, 0, 0, "Stop recording");
m_pConsole->Register("reload", "", CFGFLAG_SERVER, 0, 0, "Reload the map"); m_pConsole->Register("reload", "", CFGFLAG_SERVER, 0, 0, "Reload the map");
m_pConsole->Register("quit", "", CFGFLAG_CLIENT, Con_Quit, this, "Quit Teeworlds"); m_pConsole->Register("quit", "", CFGFLAG_CLIENT|CFGFLAG_STORE, Con_Quit, this, "Quit Teeworlds");
m_pConsole->Register("exit", "", CFGFLAG_CLIENT, Con_Quit, this, "Quit Teeworlds"); m_pConsole->Register("exit", "", CFGFLAG_CLIENT|CFGFLAG_STORE, Con_Quit, this, "Quit Teeworlds");
m_pConsole->Register("minimize", "", CFGFLAG_CLIENT|CFGFLAG_STORE, Con_Minimize, this, "Minimize Teeworlds"); m_pConsole->Register("minimize", "", CFGFLAG_CLIENT|CFGFLAG_STORE, Con_Minimize, this, "Minimize Teeworlds");
m_pConsole->Register("connect", "s", CFGFLAG_CLIENT, Con_Connect, this, "Connect to the specified host/ip"); m_pConsole->Register("connect", "s", CFGFLAG_CLIENT, Con_Connect, this, "Connect to the specified host/ip");
m_pConsole->Register("disconnect", "", CFGFLAG_CLIENT, Con_Disconnect, this, "Disconnect from the server"); m_pConsole->Register("disconnect", "", CFGFLAG_CLIENT, Con_Disconnect, this, "Disconnect from the server");

2
src/engine/server/register.h
View file

@ -47,4 +47,4 @@ public:
int RegisterProcessPacket(class CNetChunk *pPacket); int RegisterProcessPacket(class CNetChunk *pPacket);
}; };
#endif #endif

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

@ -284,7 +284,7 @@ void CScoreboard::OnRender()
return; return;
// if the score board is active, then we should clear the motd message aswell // if the score board is active, then we should clear the motd message aswell
if(m_Active) if(m_pClient->m_pMotd->IsActive())
m_pClient->m_pMotd->Clear(); m_pClient->m_pMotd->Clear();