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

Merge pull request #456 from timakro/master

Browse source 
disable deepfly patch applied at wrong position
This commit is contained in:
Dennis Felsing 2016-05-02 18:06:13 +02:00
parent 4de7b45ea6 50f9e37282
commit f6d4e0ce81
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -138,10 +138,6 @@ void CCharacter::HandleJetpack()
if (m_Jetpack && m_Core.m_ActiveWeapon == WEAPON_GUN) if (m_Jetpack && m_Core.m_ActiveWeapon == WEAPON_GUN)
FullAuto = true; 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)
return;
// check if we gonna fire // check if we gonna fire
bool WillFire = false; bool WillFire = false;
if(CountInput(m_LatestPrevInput.m_Fire, m_LatestInput.m_Fire).m_Presses) if(CountInput(m_LatestPrevInput.m_Fire, m_LatestInput.m_Fire).m_Presses)
@ -349,6 +345,10 @@ void CCharacter::FireWeapon()
if (m_Jetpack && m_Core.m_ActiveWeapon == WEAPON_GUN) if (m_Jetpack && m_Core.m_ActiveWeapon == WEAPON_GUN)
FullAuto = true; 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)
return;
// check if we gonna fire // check if we gonna fire
bool WillFire = false; bool WillFire = false;
if(CountInput(m_LatestPrevInput.m_Fire, m_LatestInput.m_Fire).m_Presses) if(CountInput(m_LatestPrevInput.m_Fire, m_LatestInput.m_Fire).m_Presses)