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

fix code style

Browse source
This commit is contained in:
archimede67 2019-06-05 19:49:00 +02:00
parent 65353c2030
commit 0e62b4b9b9
2 changed files with 25 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -3306,13 +3306,9 @@ void CClient::Con_SaveReplay(IConsole::IResult *pResult, void *pUserData)
{ {
int Length = pResult->GetInteger(0); int Length = pResult->GetInteger(0);
if(Length <= 0) if(Length <= 0)
{
pSelf->m_pConsole->Print(IConsole::OUTPUT_LEVEL_STANDARD, "replay", "Error: length must be greater than 0 second."); pSelf->m_pConsole->Print(IConsole::OUTPUT_LEVEL_STANDARD, "replay", "Error: length must be greater than 0 second.");
}
else else
{
pSelf->SaveReplay(Length); pSelf->SaveReplay(Length);
}
} }
else else
pSelf->SaveReplay(g_Config.m_ClReplayLength); pSelf->SaveReplay(g_Config.m_ClReplayLength);
@ -3324,40 +3320,40 @@ void CClient::SaveReplay(const int Length)
{ {
m_pConsole->Print(IConsole::OUTPUT_LEVEL_STANDARD, "replay", "Feature is disabled. Please enable it via configuration."); m_pConsole->Print(IConsole::OUTPUT_LEVEL_STANDARD, "replay", "Feature is disabled. Please enable it via configuration.");
GameClient()->Echo(Localize("Replay feature is disabled!")); GameClient()->Echo(Localize("Replay feature is disabled!"));
return;
} }
if(!DemoRecorder(RECORDER_REPLAYS)->IsRecording())
m_pConsole->Print(IConsole::OUTPUT_LEVEL_STANDARD, "replay", "Error: demorecorder isn't recording. Try to rejoin to fix that.");
else if(DemoRecorder(RECORDER_REPLAYS)->Length() < 1)
m_pConsole->Print(IConsole::OUTPUT_LEVEL_STANDARD, "replay", "Error: demorecorder isn't recording for at least 1 second.");
else else
{ {
if(!DemoRecorder(RECORDER_REPLAYS)->IsRecording()) // First we stop the recorder to slice correctly the demo after
m_pConsole->Print(IConsole::OUTPUT_LEVEL_STANDARD, "replay", "Error: demorecorder isn't recording. Try to rejoin to fix that."); DemoRecorder_Stop(RECORDER_REPLAYS);
else if(DemoRecorder(RECORDER_REPLAYS)->Length() < 1) char aFilename[256];
m_pConsole->Print(IConsole::OUTPUT_LEVEL_STANDARD, "replay", "Error: demorecorder isn't recording for at least 1 second.");
else
{
// First we stop the recorder to slice correctly the demo after
DemoRecorder_Stop(RECORDER_REPLAYS);
char aFilename[256];
char aDate[64]; char aDate[64];
str_timestamp(aDate, sizeof(aDate)); str_timestamp(aDate, sizeof(aDate));
str_format(aFilename, sizeof(aFilename), "demos/replays/%s_%s (replay).demo", m_aCurrentMap, aDate); str_format(aFilename, sizeof(aFilename), "demos/replays/%s_%s (replay).demo", m_aCurrentMap, aDate);
char *pSrc = (&m_DemoRecorder[RECORDER_REPLAYS])->GetCurrentFilename(); char *pSrc = (&m_DemoRecorder[RECORDER_REPLAYS])->GetCurrentFilename();
// Slice the demo to get only the last cl_replay_length seconds // Slice the demo to get only the last cl_replay_length seconds
const int EndTick = GameTick(); const int EndTick = GameTick();
const int StartTick = EndTick - Length * GameTickSpeed(); const int StartTick = EndTick - Length * GameTickSpeed();
m_pConsole->Print(IConsole::OUTPUT_LEVEL_STANDARD, "replay", "Saving replay..."); m_pConsole->Print(IConsole::OUTPUT_LEVEL_STANDARD, "replay", "Saving replay...");
// Create a job to do this slicing in background because it can be a bit long depending on the file size // Create a job to do this slicing in background because it can be a bit long depending on the file size
std::shared_ptr<CDemoEdit> pDemoEditTask = std::make_shared<CDemoEdit>(GameClient()->NetVersion(), &m_SnapshotDelta, m_pStorage, pSrc, aFilename, StartTick, EndTick); std::shared_ptr<CDemoEdit> pDemoEditTask = std::make_shared<CDemoEdit>(GameClient()->NetVersion(), &m_SnapshotDelta, m_pStorage, pSrc, aFilename, StartTick, EndTick);
Engine()->AddJob(pDemoEditTask); Engine()->AddJob(pDemoEditTask);
m_EditJobs.push_back(pDemoEditTask); m_EditJobs.push_back(pDemoEditTask);
// And we restart the recorder // And we restart the recorder
DemoRecorder_StartReplayRecorder(); DemoRecorder_StartReplayRecorder();
}
} }
} }
void CClient::DemoSlice(const char *pDstPath, CLIENTFUNC_FILTER pfnFilter, void *pUser) void CClient::DemoSlice(const char *pDstPath, CLIENTFUNC_FILTER pfnFilter, void *pUser)

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

@ -554,7 +554,7 @@ void CScoreboard::RenderRecordingNotification(float x)
str_format(aBuf2, sizeof(aBuf2), Localize("Auto %3d:%02d "), Seconds/60, Seconds%60); str_format(aBuf2, sizeof(aBuf2), Localize("Auto %3d:%02d "), Seconds/60, Seconds%60);
str_append(aBuf, aBuf2, sizeof(aBuf)); str_append(aBuf, aBuf2, sizeof(aBuf));
} }
if (m_pClient->DemoRecorder(RECORDER_REPLAYS)->IsRecording()) if(m_pClient->DemoRecorder(RECORDER_REPLAYS)->IsRecording())
{ {
Seconds = m_pClient->DemoRecorder(RECORDER_REPLAYS)->Length(); Seconds = m_pClient->DemoRecorder(RECORDER_REPLAYS)->Length();
str_format(aBuf2, sizeof(aBuf2), Localize("Replay %3d:%02d "), Seconds / 60, Seconds % 60); str_format(aBuf2, sizeof(aBuf2), Localize("Replay %3d:%02d "), Seconds / 60, Seconds % 60);