Skip to content

Commit 38456db

Browse files
committed
refactor
1 parent 71ef73e commit 38456db

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

src/game/shared/swarm/rd_inventory_shared.cpp

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3808,9 +3808,10 @@ namespace ReactiveDropInventory
38083808
return;
38093809

38103810
// Reset the Alien Kill Streak of the player inhabiting this NPC when that NPC dies, regardless of the source of damage
3811-
if ( pTarget->IsInhabitableNPC() && bKilled )
3811+
if ( bKilled && pTarget->IsInhabitableNPC() )
38123812
{
38133813
CASW_Inhabitable_NPC *pInhabitableTarget = assert_cast<CASW_Inhabitable_NPC *>( pTarget );
3814+
// only for player-controlled characters
38143815
if ( pInhabitableTarget->IsInhabited() )
38153816
s_RD_Inventory_Manager.IncrementStrangePropertyOnEquippedItems( pInhabitableTarget, 5007, 0, 0, false );
38163817
}
@@ -3825,6 +3826,7 @@ namespace ReactiveDropInventory
38253826
)
38263827
{
38273828
CASW_Inhabitable_NPC *pInhabitableAttacker = assert_cast<CASW_Inhabitable_NPC *>( pAttacker );
3829+
// only for player-controlled characters
38283830
if ( pInhabitableAttacker->IsInhabited() )
38293831
{
38303832
s_RD_Inventory_Manager.IncrementStrangePropertiesForWeapon( pInhabitableAttacker, pWeapon, 5002, 1 ); // Aliens Killed
@@ -3839,6 +3841,7 @@ namespace ReactiveDropInventory
38393841
&& !V_strcmp( STRING( pAttacker->GetEntityName() ), "trigger_pitworm_hitbox" ) )
38403842
{
38413843
CASW_Inhabitable_NPC *pInhabitableTarget = assert_cast<CASW_Inhabitable_NPC *>( pTarget );
3844+
// only for player-controlled characters
38423845
if ( pInhabitableTarget->IsInhabited() )
38433846
{
38443847
s_RD_Inventory_Manager.IncrementStrangePropertyOnEquippedItems( pInhabitableTarget, 42, 1 );
@@ -3863,6 +3866,7 @@ namespace ReactiveDropInventory
38633866
{
38643867
CASW_Inhabitable_NPC *pInhabitableAttacker = assert_cast<CASW_Inhabitable_NPC *>( pAttacker );
38653868
CASW_Inhabitable_NPC *pInhabitableTarget = assert_cast<CASW_Inhabitable_NPC *>( pTarget );
3869+
// only for player-controlled characters
38663870
if ( pInhabitableAttacker->IsInhabited() && pInhabitableTarget->IsInhabited() )
38673871
{
38683872
s_RD_Inventory_Manager.IncrementStrangePropertiesForWeapon( pInhabitableAttacker, pWeapon, 5009, 1 ); // Deathmatch Kills

0 commit comments

Comments
 (0)