Skip to content

Commit 1a08625

Browse files
committed
1 parent 4dd04f6 commit 1a08625

File tree

1 file changed

+20
-4
lines changed

1 file changed

+20
-4
lines changed

src/game/shared/tf/tf_weapon_jar.cpp

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -252,9 +252,17 @@ void CTFProjectile_Jar::SetCustomPipebombModel()
252252
// Check for Model Override
253253
int iProjectile = 0;
254254
CTFPlayer *pThrower = ToTFPlayer( GetThrower() );
255-
if ( pThrower && pThrower->GetActiveWeapon() )
255+
#ifdef BDSBASE
256+
if (pThrower && pThrower->Weapon_OwnsThisID(TF_WEAPON_JAR))
257+
#else
258+
if (pThrower && pThrower->GetActiveWeapon())
259+
#endif
256260
{
257-
CALL_ATTRIB_HOOK_INT_ON_OTHER( pThrower->GetActiveWeapon(), iProjectile, override_projectile_type );
261+
#ifdef BDSBASE
262+
CALL_ATTRIB_HOOK_INT_ON_OTHER(pThrower->Weapon_OwnsThisID(TF_WEAPON_JAR), iProjectile, override_projectile_type);
263+
#else
264+
CALL_ATTRIB_HOOK_INT_ON_OTHER(pThrower->GetActiveWeapon(), iProjectile, override_projectile_type);
265+
#endif
258266
switch ( iProjectile )
259267
{
260268
case TF_PROJECTILE_FESTIVE_JAR :
@@ -827,9 +835,17 @@ void CTFProjectile_JarMilk::SetCustomPipebombModel()
827835
// Check for Model Override
828836
int iProjectile = 0;
829837
CTFPlayer *pThrower = ToTFPlayer( GetThrower() );
830-
if ( pThrower && pThrower->GetActiveWeapon() )
838+
#ifdef BDSBASE
839+
if (pThrower && pThrower->Weapon_OwnsThisID(TF_WEAPON_JAR_MILK))
840+
#else
841+
if (pThrower && pThrower->GetActiveWeapon())
842+
#endif
831843
{
832-
CALL_ATTRIB_HOOK_INT_ON_OTHER( pThrower->GetActiveWeapon(), iProjectile, override_projectile_type );
844+
#ifdef BDSBASE
845+
CALL_ATTRIB_HOOK_INT_ON_OTHER(pThrower->Weapon_OwnsThisID(TF_WEAPON_JAR_MILK), iProjectile, override_projectile_type);
846+
#else
847+
CALL_ATTRIB_HOOK_INT_ON_OTHER(pThrower->GetActiveWeapon(), iProjectile, override_projectile_type);
848+
#endif
833849
switch ( iProjectile )
834850
{
835851
case TF_PROJECTILE_BREADMONSTER_JARATE:

0 commit comments

Comments
 (0)