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

Address reviewer comments

Browse source
This commit is contained in:
Dennis Felsing 2019-04-10 08:56:20 +02:00
parent cca80da554
commit 7c0f4c9856
2 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2862,7 +2862,9 @@ void CClient::Run()
// handle pending demo play // handle pending demo play
if(m_aCmdPlayDemo[0]) if(m_aCmdPlayDemo[0])
{ {
DemoPlayer_Play(m_aCmdPlayDemo, IStorage::TYPE_ABSOLUTE); const char *pError = DemoPlayer_Play(m_aCmdPlayDemo, IStorage::TYPE_ABSOLUTE);
if(pError)
dbg_msg("demo_player", "playing passed demo file '%s' failed: %s", m_aCmdPlayDemo, pError);
m_aCmdPlayDemo[0] = 0; m_aCmdPlayDemo[0] = 0;
} }
@ -3634,9 +3636,9 @@ void CClient::HandleConnectLink(const char *pLink)
str_copy(m_aCmdConnect, pLink + sizeof(CONNECTLINK) - 1, sizeof(m_aCmdConnect)); str_copy(m_aCmdConnect, pLink + sizeof(CONNECTLINK) - 1, sizeof(m_aCmdConnect));
} }
void CClient::HandleDemoLink(const char *pLink) void CClient::HandleDemoPath(const char *pPath)
{ {
str_copy(m_aCmdPlayDemo, pLink, sizeof(m_aCmdPlayDemo)); str_copy(m_aCmdPlayDemo, pPath, sizeof(m_aCmdPlayDemo));
} }
/* /*
@ -3787,9 +3789,9 @@ int main(int argc, const char **argv) // ignore_convention
// parse the command line arguments // parse the command line arguments
if(argc == 2 && str_startswith(argv[1], CONNECTLINK)) if(argc == 2 && str_startswith(argv[1], CONNECTLINK))
pClient->HandleConnectLink(argv[1]); pClient->HandleConnectLink(argv[1]);
if(argc == 2 && str_endswith(argv[1], ".demo")) else if(argc == 2 && str_endswith(argv[1], ".demo"))
pClient->HandleDemoLink(argv[1]); pClient->HandleDemoPath(argv[1]);
if(argc > 1) // ignore_convention else if(argc > 1) // ignore_convention
pConsole->ParseArguments(argc-1, &argv[1]); // ignore_convention pConsole->ParseArguments(argc-1, &argv[1]); // ignore_convention
pClient->Engine()->InitLogfile(); pClient->Engine()->InitLogfile();

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

@ -386,7 +386,7 @@ public:
void ServerBrowserUpdate(); void ServerBrowserUpdate();
void HandleConnectLink(const char *pLink); void HandleConnectLink(const char *pLink);
void HandleDemoLink(const char *pLink); void HandleDemoPath(const char *pPath);
// gfx // gfx
void SwitchWindowScreen(int Index); void SwitchWindowScreen(int Index);