Skip to content

Commit a2f586d

Browse files
committed
Update: OnHitConfirm skips uninhabited marines
1 parent 7274aeb commit a2f586d

1 file changed

Lines changed: 16 additions & 11 deletions

File tree

src/game/shared/swarm/rd_inventory_shared.cpp

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3811,9 +3811,12 @@ namespace ReactiveDropInventory
38113811
&& pTarget->IsAlien() )
38123812
{
38133813
CASW_Inhabitable_NPC* pInhabitableAttacker = assert_cast<CASW_Inhabitable_NPC*>( pAttacker );
3814-
s_RD_Inventory_Manager.IncrementStrangePropertiesForWeapon( pInhabitableAttacker, pWeapon, 5002, 1 ); // Aliens Killed
3815-
s_RD_Inventory_Manager.IncrementStrangePropertiesForWeapon( pInhabitableAttacker, pWeapon, 5007, 1 ); // Alien Kill Streak
3816-
s_RD_Inventory_Manager.IncrementStrangePropertiesForWeapon( pInhabitableAttacker, pWeapon, 5010, 1 ); // Aliens Killed (Twitch)
3814+
if ( pInhabitableAttacker->IsInhabited() )
3815+
{
3816+
s_RD_Inventory_Manager.IncrementStrangePropertiesForWeapon( pInhabitableAttacker, pWeapon, 5002, 1 ); // Aliens Killed
3817+
s_RD_Inventory_Manager.IncrementStrangePropertiesForWeapon( pInhabitableAttacker, pWeapon, 5007, 1 ); // Alien Kill Streak
3818+
s_RD_Inventory_Manager.IncrementStrangePropertiesForWeapon( pInhabitableAttacker, pWeapon, 5010, 1 ); // Aliens Killed (Twitch)
3819+
}
38173820
}
38183821

38193822
if ( !V_stricmp( IGameSystem::MapName(), "rd-reduction2" )
@@ -3822,16 +3825,18 @@ namespace ReactiveDropInventory
38223825
&& pTarget->IsInhabitableNPC() )
38233826
{
38243827
CASW_Inhabitable_NPC *pTargetNPC = assert_cast< CASW_Inhabitable_NPC * >( pTarget );
3825-
s_RD_Inventory_Manager.IncrementStrangePropertyOnEquippedItems( pTargetNPC, 42, 1 );
3826-
3827-
#ifdef CLIENT_DLL
3828-
static bool s_bRequestedWormToucherMedal = false;
3829-
if ( !s_bRequestedWormToucherMedal && pTargetNPC->IsInhabited() && pTargetNPC->GetCommander() && pTargetNPC->GetCommander()->IsLocalPlayer() )
3828+
if ( pTargetNPC->IsInhabited() )
38303829
{
3831-
AddPromoItem( 42 );
3832-
s_bRequestedWormToucherMedal = true;
3833-
}
3830+
s_RD_Inventory_Manager.IncrementStrangePropertyOnEquippedItems( pTargetNPC, 42, 1 );
3831+
#ifdef CLIENT_DLL
3832+
static bool s_bRequestedWormToucherMedal = false;
3833+
if ( !s_bRequestedWormToucherMedal && pTargetNPC->GetCommander() && pTargetNPC->GetCommander()->IsLocalPlayer() )
3834+
{
3835+
AddPromoItem( 42 );
3836+
s_bRequestedWormToucherMedal = true;
3837+
}
38343838
#endif
3839+
}
38353840
}
38363841
}
38373842
else

0 commit comments

Comments
 (0)