fix attrib check for atomizer

mastercoms · mastercoms · commit 79f63d2ab30e · 2023-03-02T19:07:35.000-05:00
diff --git a/src/game/shared/tf/tf_player_shared.cpp b/src/game/shared/tf/tf_player_shared.cpp
@@ -12168,16 +12168,9 @@ bool CTFPlayer::CanAirDash( void ) const
 	}
 
 	int iDashCount = tf_scout_air_dash_count.GetInt();
-	if ( GetActiveWeapon() && GetActiveTFWeapon()->GetWeaponID() == TF_WEAPON_BAT )
+	if ( GetActiveWeapon() && ( !GetActiveTFWeapon()->GetWeaponID() == TF_WEAPON_BAT || gpGlobals->curtime - GetActiveTFWeapon()->GetLastDeployTime() > 0.7f ) )
 	{
-		if ( gpGlobals->curtime - GetActiveTFWeapon()->GetLastDeployTime() > 0.7f )
-		{
-			CALL_ATTRIB_HOOK_FLOAT_ON_OTHER( GetActiveWeapon(), iDashCount, air_dash_count );
-		}
-	}
-	else
-	{
-		CALL_ATTRIB_HOOK_INT( iDashCount, air_dash_count );
+		CALL_ATTRIB_HOOK_FLOAT_ON_OTHER( GetActiveWeapon(), iDashCount, air_dash_count );
 	}
 	if ( m_Shared.GetAirDash() >= iDashCount ) 
 		return false;

Original file line number	Diff line number	Diff line change
`@@ -12168,16 +12168,9 @@ bool CTFPlayer::CanAirDash( void ) const`
`12168`	`12168`	`}`
`12169`	`12169`
`12170`	`12170`	`int iDashCount = tf_scout_air_dash_count.GetInt();`
`12171`		`- if ( GetActiveWeapon() && GetActiveTFWeapon()->GetWeaponID() == TF_WEAPON_BAT )`
	`12171`	`+ if ( GetActiveWeapon() && ( !GetActiveTFWeapon()->GetWeaponID() == TF_WEAPON_BAT \|\| gpGlobals->curtime - GetActiveTFWeapon()->GetLastDeployTime() > 0.7f ) )`
`12172`	`12172`	`{`
`12173`		`- if ( gpGlobals->curtime - GetActiveTFWeapon()->GetLastDeployTime() > 0.7f )`
`12174`		`- {`
`12175`		`- CALL_ATTRIB_HOOK_FLOAT_ON_OTHER( GetActiveWeapon(), iDashCount, air_dash_count );`
`12176`		`- }`
`12177`		`- }`
`12178`		`- else`
`12179`		`- {`
`12180`		`- CALL_ATTRIB_HOOK_INT( iDashCount, air_dash_count );`
	`12173`	`+ CALL_ATTRIB_HOOK_FLOAT_ON_OTHER( GetActiveWeapon(), iDashCount, air_dash_count );`
`12181`	`12174`	`}`
`12182`	`12175`	`if ( m_Shared.GetAirDash() >= iDashCount )`
`12183`	`12176`	`return false;`