ensl/NS
0
0
Fork 0
mirror of https://github.com/ENSL/NS.git synced 2024-11-27 06:42:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

o Fixed bug that sometimes made the leap animations not play

Browse source 
git-svn-id: https://unknownworlds.svn.cloudforge.com/ns1@473 67975925-1194-0748-b3d5-c16f83f1a3a1
This commit is contained in:
tankefugl 2006-05-10 00:25:59 +00:00
parent 31406c2891
commit 5fd78a9011
1 changed files with 24 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
releases/3.2.0/source/cl_dll/hl/hl_weapons.cpp
View file

@ -543,11 +543,33 @@ void CBasePlayerWeapon::ItemPostFrame( void )
{ {
int wID = AVH_ABILITY_LEAP; int wID = AVH_ABILITY_LEAP;
CBasePlayerWeapon* theWeapon = g_pWpns[wID]; CBasePlayerWeapon* theWeapon = g_pWpns[wID];
// HACKIER THAN HACKEST =(
// predict whether we can fire the weapon
bool enabled = false;
ItemInfo theItemInfo;
theWeapon->GetItemInfo(&theItemInfo);
WEAPON *pWeapon = gWR.GetWeapon( theItemInfo.iId );
if ( pWeapon != 0 ) {
enabled = (pWeapon->iEnabled == 1);
}
float theEnergyCost = (float)(BALANCE_VAR(kLeapEnergyCost));
float theFuser3 = 0.0f;
cl_entity_s* theLocalPlayer = gEngfuncs.GetLocalPlayer();
if(theLocalPlayer)
theFuser3 = theLocalPlayer->curstate.fuser3;
// Make sure we have enough energy for this attack
enabled &= AvHMUHasEnoughAlienEnergy(theFuser3, theEnergyCost);
// END FUGLY HACK
switch (gHUD.GetHUDUser3()) switch (gHUD.GetHUDUser3())
{ {
case AVH_USER3_ALIEN_PLAYER1: case AVH_USER3_ALIEN_PLAYER1:
if ((this->m_flLastAnimationPlayed + (float)BALANCE_VAR(kLeapROF) <= gpGlobals->time) &&
(theWeapon->IsUseable())) if (enabled && (this->m_flLastAnimationPlayed + (float)BALANCE_VAR(kLeapROF) <= gpGlobals->time))
{ {
this->SendWeaponAnim(3); this->SendWeaponAnim(3);
this->m_flLastAnimationPlayed = gpGlobals->time; this->m_flLastAnimationPlayed = gpGlobals->time;