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 #2159

Browse source 
2159: Make the dummy always press fire when cl_dummy_hammer is active r=heinrich5991 a=trml



Co-authored-by: trml <trml@users.noreply.github.com>
This commit is contained in:
bors[bot] 2020-05-01 23:20:22 +00:00 committed by GitHub
parent 2067a1af65 bcf9e003d7
commit 65284f3a28
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
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/client/gameclient.cpp
View file

@ -413,7 +413,7 @@ int CGameClient::OnSnapInput(int *pData, bool Dummy, bool Force)
{
if(m_DummyFire != 0)
{
m_DummyInput.m_Fire = m_HammerInput.m_Fire;
m_DummyInput.m_Fire = (m_HammerInput.m_Fire+1) & ~1;
m_DummyFire = 0;
}
@ -434,7 +434,7 @@ int CGameClient::OnSnapInput(int *pData, bool Dummy, bool Force)
}
m_DummyFire++;
m_HammerInput.m_Fire += 2;
m_HammerInput.m_Fire = (m_HammerInput.m_Fire+1) | 1;
m_HammerInput.m_WantedWeapon = WEAPON_HAMMER + 1;
if(!g_Config.m_ClDummyRestoreWeapon)
{