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

Merge #1171

Browse source 
1171: Fix pain emote immunity with jetpack r=heinrich5991 a=Piepow

When using jetpack, tees don't do pain emotes when they're supposed to (e.g. when they get hit by exploding bullets).

Notice how in the image below the tee doesn't have the pain emote.
![jetpack-pain-emote-immunity](https://user-images.githubusercontent.com/20409621/41883435-9b13aa1e-78bc-11e8-8fef-fd75165b4d79.png)


Co-authored-by: Piepow <piepow@users.noreply.github.com>
This commit is contained in:
bors[bot] 2018-06-26 10:43:13 +00:00
parent e8d283e4f5 9f61424860
commit 6ba56963ec
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

@ -165,7 +165,7 @@ void CCharacter::HandleJetpack()
Strength = GameServer()->Tuning()->m_JetpackStrength;
else
Strength = GameServer()->TuningList()[m_TuneZone].m_JetpackStrength;
TakeDamage(Direction * -1.0f * (Strength / 100.0f / 6.11f), g_pData->m_Weapons.m_Hammer.m_pBase->m_Damage, m_pPlayer->GetCID(), m_Core.m_ActiveWeapon);
TakeDamage(Direction * -1.0f * (Strength / 100.0f / 6.11f), 0, m_pPlayer->GetCID(), m_Core.m_ActiveWeapon);
}
}
}
@ -990,7 +990,7 @@ bool CCharacter::TakeDamage(vec2 Force, int Dmg, int From, int Weapon)
else
GameServer()->CreateSound(m_Pos, SOUND_PLAYER_PAIN_SHORT);*/
if (!m_Jetpack || m_Core.m_ActiveWeapon != WEAPON_GUN)
if (Dmg)
{
m_EmoteType = EMOTE_PAIN;
m_EmoteStop = Server()->Tick() + 500 * Server()->TickSpeed() / 1000;