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

rebased to ef32fc4

Browse source
This commit is contained in:
sirius 2019-09-30 21:03:37 +08:00
parent e4fdeefdd4
commit b0ee5671ff
3 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2807,7 +2807,8 @@ void CClient::Run()
#if defined(CONF_VIDEORECORDER)
IVideo::SetLocalStartTime(m_LocalStartTime);
#endif
m_SnapshotParts = 0;
m_SnapshotParts[0] = 0;
m_SnapshotParts[1] = 0;
if(m_GenerateTimeoutSeed)
{

5
src/game/client/components/menus_demo.cpp
View file

@ -854,12 +854,11 @@ void CMenus::RenderDemoList(CUIRect MainView)
ButtonBar.VSplitLeft(10.0f, 0, &ButtonBar);
ButtonBar.VSplitLeft(110.0f, &RenameRect, &ButtonBar);
ButtonBar.VSplitLeft(10.0f, 0, &ButtonBar);
ButtonBar.VSplitLeft(110.0f, &LabelRect, &ButtonBar);
ButtonBar.VSplitLeft(120.0f, &RenameRect, &ButtonBar);
#if defined(CONF_VIDEORECORDER)
ButtonBar.VSplitLeft(10.0f, 0, &ButtonBar);
ButtonBar.VSplitLeft(110.0f, &RenderRect, &ButtonBar);
ButtonBar.VSplitLeft(10.0f, 0, &ButtonBar);
#endif
ButtonBar.VSplitLeft(110.0f, &LabelRect, &ButtonBar);
MainView.HSplitBottom(140.0f, &ListBox, &MainView);
// render demo info

3
src/game/client/components/skins.cpp
View file

@ -4,6 +4,7 @@
#include <base/system.h>
#include <base/math.h>
#include <ctime>
#include <engine/graphics.h>
#include <engine/storage.h>
@ -156,7 +157,7 @@ void CSkins::OnInit()
{
time_t rawtime;
struct tm* timeinfo;
time(&rawtime);
std::time(&rawtime);
timeinfo = localtime(&rawtime);
if(timeinfo->tm_mon == 11 && timeinfo->tm_mday >= 24 && timeinfo->tm_mday <= 26)
{ // Christmas