unknownworlds/ns
0
0
Fork 0
mirror of https://github.com/unknownworlds/NS.git synced 2025-06-01 09:32:20 +00:00
Code Issues Projects Releases Packages Wiki Activity

o Fixed bug where +attack with charge selected could cause an infinite charge

Browse source 
git-svn-id: https://unknownworlds.svn.cloudforge.com/ns1@474 67975925-1194-0748-b3d5-c16f83f1a3a1
This commit is contained in:
tankefugl 2006-05-11 01:05:09 +00:00
parent 5fd78a9011
commit c8908043ab
2 changed files with 8 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
releases/3.2.0/source/cl_dll/input.cpp
View file

@ -1514,6 +1514,7 @@ void CL_ResetButtonBits( int bits )
{ {
// totally clear state // totally clear state
in_attack.state &= ~7; in_attack.state &= ~7;
in_attack2.state &= ~7;
} }
} }
} }

8
releases/3.2.0/source/mod/AvHAlienAbilities.cpp
View file

@ -58,6 +58,8 @@
#include "mod/AvHHud.h" #include "mod/AvHHud.h"
extern int g_runfuncs; extern int g_runfuncs;
void IN_Attack2Down(); void IN_Attack2Down();
void IN_Attack2Up();
bool CheckInAttack();
#endif #endif
LINK_ENTITY_TO_CLASS(kwLeap, AvHLeap); LINK_ENTITY_TO_CLASS(kwLeap, AvHLeap);
@ -303,7 +305,11 @@ void AvHCharge::SecondaryAttack()
void AvHCharge::FireProjectiles(void) void AvHCharge::FireProjectiles(void)
{ {
#ifdef AVH_CLIENT #ifdef AVH_CLIENT
IN_Attack2Down(); if (CheckInAttack())
IN_Attack2Down();
else
IN_Attack2Up();
//gHUD.SetAlienAbility(this->GetAbilityImpulse()); //gHUD.SetAlienAbility(this->GetAbilityImpulse());
#endif #endif