mirror of
https://github.com/ddnet/ddnet.git
synced 2024-11-14 03:58:18 +00:00
Compare commits
No commits in common. "8d431f8feb659ae54cbbda8fa5b965019e9af303" and "66fb5d5d7f3b502bd4a3b1bef0d830690ce08c50" have entirely different histories.
8d431f8feb
...
66fb5d5d7f
|
@ -73,7 +73,6 @@ MACRO_CONFIG_INT(ClShowfps, cl_showfps, 0, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE,
|
||||||
MACRO_CONFIG_INT(ClShowpred, cl_showpred, 0, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Show ingame prediction time in milliseconds")
|
MACRO_CONFIG_INT(ClShowpred, cl_showpred, 0, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Show ingame prediction time in milliseconds")
|
||||||
MACRO_CONFIG_INT(ClEyeWheel, cl_eye_wheel, 1, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Show eye wheel along together with emotes")
|
MACRO_CONFIG_INT(ClEyeWheel, cl_eye_wheel, 1, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Show eye wheel along together with emotes")
|
||||||
MACRO_CONFIG_INT(ClEyeDuration, cl_eye_duration, 999999, 1, 999999, CFGFLAG_CLIENT | CFGFLAG_SAVE, "How long the eyes emotes last")
|
MACRO_CONFIG_INT(ClEyeDuration, cl_eye_duration, 999999, 1, 999999, CFGFLAG_CLIENT | CFGFLAG_SAVE, "How long the eyes emotes last")
|
||||||
MACRO_CONFIG_INT(ClFreezeStars, cl_freeze_stars, 0, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Show old star particles for frozen tees")
|
|
||||||
|
|
||||||
MACRO_CONFIG_INT(ClAirjumpindicator, cl_airjumpindicator, 1, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Show the air jump indicator")
|
MACRO_CONFIG_INT(ClAirjumpindicator, cl_airjumpindicator, 1, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Show the air jump indicator")
|
||||||
MACRO_CONFIG_INT(ClThreadsoundloading, cl_threadsoundloading, 1, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Load sound files threaded")
|
MACRO_CONFIG_INT(ClThreadsoundloading, cl_threadsoundloading, 1, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Load sound files threaded")
|
||||||
|
|
|
@ -2071,32 +2071,6 @@ void CGameClient::OnNewSnapshot()
|
||||||
m_Effects.AirJump(Pos, Alpha);
|
m_Effects.AirJump(Pos, Alpha);
|
||||||
}
|
}
|
||||||
|
|
||||||
if(g_Config.m_ClFreezeStars && !m_SuppressEvents)
|
|
||||||
{
|
|
||||||
for(auto &Character : m_Snap.m_aCharacters)
|
|
||||||
{
|
|
||||||
if(Character.m_Active && Character.m_HasExtendedData && Character.m_PrevExtendedData)
|
|
||||||
{
|
|
||||||
int FreezeTimeNow = Character.m_ExtendedData.m_FreezeEnd - Client()->GameTick(g_Config.m_ClDummy);
|
|
||||||
int FreezeTimePrev = Character.m_PrevExtendedData->m_FreezeEnd - Client()->PrevGameTick(g_Config.m_ClDummy);
|
|
||||||
vec2 Pos = vec2(Character.m_Cur.m_X, Character.m_Cur.m_Y);
|
|
||||||
int StarsNow = (FreezeTimeNow + 1) / Client()->GameTickSpeed();
|
|
||||||
int StarsPrev = (FreezeTimePrev + 1) / Client()->GameTickSpeed();
|
|
||||||
if(StarsNow < StarsPrev || (StarsPrev == 0 && StarsNow > 0))
|
|
||||||
{
|
|
||||||
int Amount = StarsNow + 1;
|
|
||||||
float Mid = 3 * pi / 2;
|
|
||||||
float Min = Mid - pi / 3;
|
|
||||||
float Max = Mid + pi / 3;
|
|
||||||
for(int j = 0; j < Amount; j++)
|
|
||||||
{
|
|
||||||
float Angle = mix(Min, Max, (j + 1) / (float)(Amount + 2));
|
|
||||||
m_Effects.DamageIndicator(Pos, direction(Angle));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if(m_Snap.m_LocalClientId != m_PrevLocalId)
|
if(m_Snap.m_LocalClientId != m_PrevLocalId)
|
||||||
m_PredictedDummyId = m_PrevLocalId;
|
m_PredictedDummyId = m_PrevLocalId;
|
||||||
m_PrevLocalId = m_Snap.m_LocalClientId;
|
m_PrevLocalId = m_Snap.m_LocalClientId;
|
||||||
|
|
Loading…
Reference in a new issue