From 55934b2481be070e6e8800008d4eade0f8e5b0ab Mon Sep 17 00:00:00 2001
From: tankefugl <tankefugl@67975925-1194-0748-b3d5-c16f83f1a3a1>
Date: Fri, 26 May 2006 23:51:09 +0000
Subject: [PATCH] o Fixed the previous fix ...

git-svn-id: https://unknownworlds.svn.cloudforge.com/ns1@507 67975925-1194-0748-b3d5-c16f83f1a3a1
---
 releases/3.2.0/source/cl_dll/hl/hl_weapons.cpp  | 16 ++++++++++++----
 releases/3.2.0/source/mod/AvHAlienAbilities.cpp |  2 +-
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/releases/3.2.0/source/cl_dll/hl/hl_weapons.cpp b/releases/3.2.0/source/cl_dll/hl/hl_weapons.cpp
index bddb6575..ec6a1468 100644
--- a/releases/3.2.0/source/cl_dll/hl/hl_weapons.cpp
+++ b/releases/3.2.0/source/cl_dll/hl/hl_weapons.cpp
@@ -528,12 +528,19 @@ void CBasePlayerWeapon::ItemPostFrame( void )
 			    m_fFireOnEmpty = TRUE;
 		    }
 
-		    //#ifdef AVH_CLIENT
+
+//			if ((gHUD.GetHUDUser3() == AVH_USER3_ALIEN_PLAYER1) && (gHUD.GetCurrentWeaponID() == AVH_ABILITY_LEAP))
+//			{
+//				this->SendWeaponAnim(3);
+//				this->m_flLastAnimationPlayed = gpGlobals->time;
+//			}
+			//#ifdef AVH_CLIENT
 		    //if((m_iClip == 0) && ?
 		    //#endif
 
-		    PrimaryAttack();
-        }
+			PrimaryAttack();
+			//return;
+		}
 	}
 	// +movement: Rewritten to allow us to use +attack2 for movement abilities
 	else if ((m_pPlayer->pev->button & IN_ATTACK2) && (m_flNextPrimaryAttack <= 0.0) && (gHUD.GetIsAlien()))
@@ -603,7 +610,8 @@ void CBasePlayerWeapon::ItemPostFrame( void )
 			}
 		}
 
-		if (this->m_flLastAnimationPlayed + BALANCE_VAR(kLeapROF) < gpGlobals->time)
+		if ((gHUD.GetHUDUser3() == AVH_USER3_ALIEN_PLAYER1) 
+			&& (this->m_flLastAnimationPlayed + BALANCE_VAR(kLeapROF) < gpGlobals->time))
 			this->PrevAttack2Status = false;
 		else
 			this->PrevAttack2Status = true;
diff --git a/releases/3.2.0/source/mod/AvHAlienAbilities.cpp b/releases/3.2.0/source/mod/AvHAlienAbilities.cpp
index cc40b42a..6bfc0459 100644
--- a/releases/3.2.0/source/mod/AvHAlienAbilities.cpp
+++ b/releases/3.2.0/source/mod/AvHAlienAbilities.cpp
@@ -177,7 +177,7 @@ void AvHLeap::FireProjectiles(void)
 	if(g_runfuncs)
 	{
 		//IN_Attack2Down();
-		//this->SendWeaponAnim(3);
+		//CBasePlayerWeapon::SendWeaponAnim(3);
 		gHUD.SetAlienAbility(this->GetAbilityImpulse());
 	}
 #endif