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

Only send pain sound in freeze if fire was released

Browse source
This commit is contained in:
trml 2020-08-25 22:45:23 +02:00
parent 955ccb9995
commit c98a1f0a59
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -367,7 +367,7 @@ void CCharacter::FireWeapon()
if(CountInput(m_LatestPrevInput.m_Fire, m_LatestInput.m_Fire).m_Presses) if(CountInput(m_LatestPrevInput.m_Fire, m_LatestInput.m_Fire).m_Presses)
WillFire = true; WillFire = true;
if(FullAuto && (m_LatestInput.m_Fire&1) && m_aWeapons[m_Core.m_ActiveWeapon].m_Ammo && !m_FreezeTime) if(FullAuto && (m_LatestInput.m_Fire&1) && m_aWeapons[m_Core.m_ActiveWeapon].m_Ammo)
WillFire = true; WillFire = true;
if(!WillFire) if(!WillFire)
@ -376,7 +376,7 @@ void CCharacter::FireWeapon()
if (m_FreezeTime) if (m_FreezeTime)
{ {
// Timer stuff to avoid shrieking orchestra caused by unfreeze-plasma // Timer stuff to avoid shrieking orchestra caused by unfreeze-plasma
if(m_PainSoundTimer<=0) if(m_PainSoundTimer<=0 && !(m_LatestPrevInput.m_Fire&1))
{ {
m_PainSoundTimer = 1 * Server()->TickSpeed(); m_PainSoundTimer = 1 * Server()->TickSpeed();
GameServer()->CreateSound(m_Pos, SOUND_PLAYER_PAIN_LONG, Teams()->TeamMask(Team(), -1, m_pPlayer->GetCID())); GameServer()->CreateSound(m_Pos, SOUND_PLAYER_PAIN_LONG, Teams()->TeamMask(Team(), -1, m_pPlayer->GetCID()));