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

Make envelopes unsynchronized by default and explain the setting better (fixes #479)

Browse source
This commit is contained in:
def 2016-05-14 00:42:40 +02:00
parent b0b2774695
commit ff747953b4
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/game/editor/editor.cpp
View file

@ -4393,7 +4393,7 @@ void CEditor::RenderEnvelopeEditor(CUIRect View)
ToolBar.VSplitLeft(15.0f, &Button, &ToolBar); ToolBar.VSplitLeft(15.0f, &Button, &ToolBar);
ToolBar.VSplitLeft(12.0f, &Button, &ToolBar); ToolBar.VSplitLeft(12.0f, &Button, &ToolBar);
static int s_SyncButton; static int s_SyncButton;
if(DoButton_Editor(&s_SyncButton, pEnvelope->m_Synchronized?"X":"", 0, &Button, 0, "Enable envelope synchronization between clients")) if(DoButton_Editor(&s_SyncButton, pEnvelope->m_Synchronized?"X":"", 0, &Button, 0, "Synchronize envelope animation to game time (restarts when you touch the start line)"))
pEnvelope->m_Synchronized = !pEnvelope->m_Synchronized; pEnvelope->m_Synchronized = !pEnvelope->m_Synchronized;
ToolBar.VSplitLeft(4.0f, &Button, &ToolBar); ToolBar.VSplitLeft(4.0f, &Button, &ToolBar);

2
src/game/editor/editor.h
View file

@ -61,7 +61,7 @@ public:
m_aName[0] = 0; m_aName[0] = 0;
m_Bottom = 0; m_Bottom = 0;
m_Top = 0; m_Top = 0;
m_Synchronized = true; m_Synchronized = false;
} }
void Resort() void Resort()