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

Process CPlayer::m_DefEmoteReset in CPlayer

Browse source
This commit is contained in:
Alexander Akulich 2021-01-12 20:35:07 +03:00
parent ecce5631ed
commit b36a4fd8c3
2 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/game/server/entities/character.cpp
View file

@ -2193,13 +2193,6 @@ void CCharacter::DDRacePostCoreTick()
{
m_Time = (float)(Server()->Tick() - m_StartTime) / ((float)Server()->TickSpeed());
if(m_pPlayer->m_DefEmoteReset >= 0 && m_pPlayer->m_DefEmoteReset <= Server()->Tick())
{
m_pPlayer->m_DefEmoteReset = -1;
m_EmoteType = m_pPlayer->m_DefEmote = EMOTE_NORMAL;
m_EmoteStop = -1;
}
if(m_EndlessHook || (m_Super && g_Config.m_SvEndlessSuperHook))
m_Core.m_HookTick = 0;

6
src/game/server/player.cpp
View file

@ -269,6 +269,12 @@ void CPlayer::Tick()
GameServer()->SendTuningParams(m_ClientID, m_TuneZone);
}
if(m_DefEmoteReset >= 0 && m_DefEmoteReset <= Server()->Tick())
{
m_DefEmoteReset = -1;
m_DefEmote = EMOTE_NORMAL;
}
if(m_Halloween && m_pCharacter && !m_pCharacter->IsPaused())
{
if(1200 - ((Server()->Tick() - m_pCharacter->GetLastAction()) % (1200)) < 5)