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 pull request #1942 from def-/pr-deepfly

Browse source 
Change sv_deepfly to work with hammer explicitly
This commit is contained in:
Dennis Felsing 2019-10-15 15:19:35 +02:00 committed by GitHub
parent 7a991615f3 3a3df05cca
commit c72edb18bb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/game/client/prediction/entities/character.cpp
View file

@ -270,8 +270,8 @@ void CCharacter::FireWeapon()
if (m_Jetpack && m_Core.m_ActiveWeapon == WEAPON_GUN)
FullAuto = true;
// don't fire non auto weapons when player is deep and sv_deepfly is disabled
if(!g_Config.m_SvDeepfly && !FullAuto && m_DeepFreeze)
// don't fire hammer when player is deep and sv_deepfly is disabled
if(!g_Config.m_SvDeepfly && m_Core.m_ActiveWeapon != WEAPON_HAMMER && m_DeepFreeze)
return;
// check if we gonna fire

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

@ -348,8 +348,8 @@ void CCharacter::FireWeapon()
if(m_FrozenLastTick)
FullAuto = true;
// don't fire non auto weapons when player is deep and sv_deepfly is disabled
if(!g_Config.m_SvDeepfly && !FullAuto && m_DeepFreeze)
// don't fire hammer when player is deep and sv_deepfly is disabled
if(!g_Config.m_SvDeepfly && m_Core.m_ActiveWeapon != WEAPON_HAMMER && m_DeepFreeze)
return;
// check if we gonna fire