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

Recording with multiple clients working

Browse source
This commit is contained in:
def 2014-08-22 14:18:16 +02:00
parent 2cff296c25
commit 3c4bf96b8c
3 changed files with 217 additions and 202 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/base/system.c
View file

@ -44,6 +44,7 @@
#include <fcntl.h>
#include <direct.h>
#include <errno.h>
#include <process.h>
#else
#error NOT IMPLEMENTED
#endif
@ -2033,6 +2034,15 @@ unsigned str_quickhash(const char *str)
return hash;
}
int pid()
{
#if defined(CONF_FAMILY_WINDOWS)
return _getpid();
#else
return getpid();
#endif
}
#if defined(__cplusplus)
}

2
src/base/system.h
View file

@ -1296,6 +1296,8 @@ int str_utf8_encode(char *ptr, int chr);
*/
int str_utf8_check(const char *str);
int pid();
#ifdef __cplusplus
}
#endif

13
src/game/client/components/race_demo.cpp
View file

@ -2,6 +2,7 @@
#include <stdio.h>
#include <base/system.h>
#include <engine/shared/config.h>
#include <engine/serverbrowser.h>
#include <engine/storage.h>
@ -36,7 +37,9 @@ void CRaceDemo::OnRender()
if(start)
{
OnReset();
m_pMap = Client()->RaceRecordStart("tmp");
char aBuf[512];
str_format(aBuf, sizeof(aBuf), "tmp_%d", pid());
m_pMap = Client()->RaceRecordStart(aBuf);
m_DemoStartTick = Client()->GameTick() + Client()->GameTickSpeed();
m_RaceState = RACE_STARTED;
}
@ -60,7 +63,7 @@ void CRaceDemo::OnReset()
Client()->RaceRecordStop();
char aFilename[512];
str_format(aFilename, sizeof(aFilename), "demos/%s_tmp.demo", m_pMap);
str_format(aFilename, sizeof(aFilename), "demos/%s_tmp_%d.demo", m_pMap, pid());
Storage()->RemoveFile(aFilename, IStorage::TYPE_SAVE);
m_Time = 0;
@ -75,7 +78,7 @@ void CRaceDemo::OnShutdown()
Client()->RaceRecordStop();
char aFilename[512];
str_format(aFilename, sizeof(aFilename), "demos/%s_tmp.demo", m_pMap);
str_format(aFilename, sizeof(aFilename), "demos/%s_tmp_%d.demo", m_pMap, pid());
Storage()->RemoveFile(aFilename, IStorage::TYPE_SAVE);
}
@ -134,7 +137,7 @@ void CRaceDemo::CheckDemo()
Client()->RaceRecordStop();
char aTmpDemoName[128];
str_format(aTmpDemoName, sizeof(aTmpDemoName), "%s_tmp", m_pMap);
str_format(aTmpDemoName, sizeof(aTmpDemoName), "%s_tmp_%d", m_pMap, pid());
// loop through demo files
m_pClient->m_pMenus->DemolistPopulate();
@ -194,7 +197,7 @@ void CRaceDemo::SaveDemo(const char* pDemo)
else
str_format(aNewFilename, sizeof(aNewFilename), "demos/%s_%5.2f.demo", pDemo, m_Time);
str_format(aOldFilename, sizeof(aOldFilename), "demos/%s_tmp.demo", m_pMap);
str_format(aOldFilename, sizeof(aOldFilename), "demos/%s_tmp_%d.demo", m_pMap, pid());
Storage()->RenameFile(aOldFilename, aNewFilename, IStorage::TYPE_SAVE);