mirror of
https://github.com/ddnet/ddnet.git
synced 2024-09-21 01:54:19 +00:00
rebased to ef32fc4
This commit is contained in:
parent
e4fdeefdd4
commit
b0ee5671ff
|
@ -2807,7 +2807,8 @@ void CClient::Run()
|
||||||
#if defined(CONF_VIDEORECORDER)
|
#if defined(CONF_VIDEORECORDER)
|
||||||
IVideo::SetLocalStartTime(m_LocalStartTime);
|
IVideo::SetLocalStartTime(m_LocalStartTime);
|
||||||
#endif
|
#endif
|
||||||
m_SnapshotParts = 0;
|
m_SnapshotParts[0] = 0;
|
||||||
|
m_SnapshotParts[1] = 0;
|
||||||
|
|
||||||
if(m_GenerateTimeoutSeed)
|
if(m_GenerateTimeoutSeed)
|
||||||
{
|
{
|
||||||
|
|
|
@ -854,12 +854,11 @@ void CMenus::RenderDemoList(CUIRect MainView)
|
||||||
ButtonBar.VSplitLeft(10.0f, 0, &ButtonBar);
|
ButtonBar.VSplitLeft(10.0f, 0, &ButtonBar);
|
||||||
ButtonBar.VSplitLeft(110.0f, &RenameRect, &ButtonBar);
|
ButtonBar.VSplitLeft(110.0f, &RenameRect, &ButtonBar);
|
||||||
ButtonBar.VSplitLeft(10.0f, 0, &ButtonBar);
|
ButtonBar.VSplitLeft(10.0f, 0, &ButtonBar);
|
||||||
ButtonBar.VSplitLeft(110.0f, &LabelRect, &ButtonBar);
|
|
||||||
ButtonBar.VSplitLeft(120.0f, &RenameRect, &ButtonBar);
|
|
||||||
#if defined(CONF_VIDEORECORDER)
|
#if defined(CONF_VIDEORECORDER)
|
||||||
ButtonBar.VSplitLeft(10.0f, 0, &ButtonBar);
|
|
||||||
ButtonBar.VSplitLeft(110.0f, &RenderRect, &ButtonBar);
|
ButtonBar.VSplitLeft(110.0f, &RenderRect, &ButtonBar);
|
||||||
|
ButtonBar.VSplitLeft(10.0f, 0, &ButtonBar);
|
||||||
#endif
|
#endif
|
||||||
|
ButtonBar.VSplitLeft(110.0f, &LabelRect, &ButtonBar);
|
||||||
MainView.HSplitBottom(140.0f, &ListBox, &MainView);
|
MainView.HSplitBottom(140.0f, &ListBox, &MainView);
|
||||||
|
|
||||||
// render demo info
|
// render demo info
|
||||||
|
|
|
@ -4,6 +4,7 @@
|
||||||
|
|
||||||
#include <base/system.h>
|
#include <base/system.h>
|
||||||
#include <base/math.h>
|
#include <base/math.h>
|
||||||
|
#include <ctime>
|
||||||
|
|
||||||
#include <engine/graphics.h>
|
#include <engine/graphics.h>
|
||||||
#include <engine/storage.h>
|
#include <engine/storage.h>
|
||||||
|
@ -156,7 +157,7 @@ void CSkins::OnInit()
|
||||||
{
|
{
|
||||||
time_t rawtime;
|
time_t rawtime;
|
||||||
struct tm* timeinfo;
|
struct tm* timeinfo;
|
||||||
time(&rawtime);
|
std::time(&rawtime);
|
||||||
timeinfo = localtime(&rawtime);
|
timeinfo = localtime(&rawtime);
|
||||||
if(timeinfo->tm_mon == 11 && timeinfo->tm_mday >= 24 && timeinfo->tm_mday <= 26)
|
if(timeinfo->tm_mon == 11 && timeinfo->tm_mday >= 24 && timeinfo->tm_mday <= 26)
|
||||||
{ // Christmas
|
{ // Christmas
|
||||||
|
|
Loading…
Reference in a new issue