mirror of
https://github.com/ddnet/ddnet.git
synced 2024-09-19 09:12:19 +00:00
Compare commits
4 commits
20f8b4bf1c
...
53548d5e85
Author | SHA1 | Date | |
---|---|---|---|
53548d5e85 | |||
8d431f8feb | |||
80e2de13da | |||
3494958763 |
|
@ -73,6 +73,7 @@ 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(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(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(ClThreadsoundloading, cl_threadsoundloading, 1, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Load sound files threaded")
|
||||
|
|
|
@ -55,11 +55,18 @@ static ColorRGBA GetPingTextColor(int Latency)
|
|||
static ColorRGBA GetGametypeTextColor(const char *pGametype)
|
||||
{
|
||||
ColorHSLA HslaColor;
|
||||
if(str_comp(pGametype, "DM") == 0 || str_comp(pGametype, "TDM") == 0 || str_comp(pGametype, "CTF") == 0)
|
||||
if(str_comp(pGametype, "DM") == 0 || str_comp(pGametype, "TDM") == 0 || str_comp(pGametype, "CTF") == 0 || str_comp(pGametype, "LMS") == 0 || str_comp(pGametype, "LTS") == 0)
|
||||
HslaColor = ColorHSLA(0.33f, 1.0f, 0.75f);
|
||||
else if(str_find_nocase(pGametype, "catch"))
|
||||
HslaColor = ColorHSLA(0.17f, 1.0f, 0.75f);
|
||||
else if(str_find_nocase(pGametype, "idm") || str_find_nocase(pGametype, "itdm") || str_find_nocase(pGametype, "ictf") || str_find_nocase(pGametype, "f-ddrace"))
|
||||
else if(str_find_nocase(pGametype, "dm") || str_find_nocase(pGametype, "tdm") || str_find_nocase(pGametype, "ctf") || str_find_nocase(pGametype, "lms") || str_find_nocase(pGametype, "lts"))
|
||||
{
|
||||
if(pGametype[0] == 'i' || pGametype[0] == 'g')
|
||||
HslaColor = ColorHSLA(0.0f, 1.0f, 0.75f);
|
||||
else
|
||||
HslaColor = ColorHSLA(0.375f, 1.0f, 0.35f);
|
||||
}
|
||||
else if(str_find_nocase(pGametype, "f-ddrace") || str_find_nocase(pGametype, "freeze"))
|
||||
HslaColor = ColorHSLA(0.0f, 1.0f, 0.75f);
|
||||
else if(str_find_nocase(pGametype, "fng"))
|
||||
HslaColor = ColorHSLA(0.83f, 1.0f, 0.75f);
|
||||
|
|
|
@ -2071,6 +2071,32 @@ void CGameClient::OnNewSnapshot()
|
|||
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)
|
||||
m_PredictedDummyId = m_PrevLocalId;
|
||||
m_PrevLocalId = m_Snap.m_LocalClientId;
|
||||
|
|
Loading…
Reference in a new issue