Skip to content

Hotfix: Deathmatch: handle nullptr pAttacker to prevent crash. #995

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
BenLubar merged 3 commits into from
Nov 4, 2025
+27 −30
Merged

Hotfix: Deathmatch: handle nullptr pAttacker to prevent crash. #995

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
51bd748
Hotfix: Deathmatch: handle nullptr pAttacker to prevent crash
Kitsune44 Nov 4, 2025
7274aeb
Refactor: OnHitConfirm
Kitsune44 Nov 4, 2025
a2f586d
Update: OnHitConfirm skips uninhabited marines
Kitsune44 Nov 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
57 changes: 27 additions & 30 deletions src/game/shared/swarm/rd_inventory_shared.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3797,61 +3797,58 @@ namespace ReactiveDropInventory
{
#ifdef CLIENT_DLL
if ( engine->IsPlayingDemo() )
{
return;
}
#endif

CASW_Game_Resource *pGameResource = ASWGameResource();
if ( !pGameResource )
if ( !ASWGameResource()
|| !pAttacker
|| !pTarget )
return;

if ( !ASWDeathmatchMode() )
{
if ( pTarget && pTarget->IsInhabitableNPC() && bKilled )
if ( bKilled && pWeapon
&& pAttacker->IsInhabitableNPC()
&& pTarget->IsAlien() )
{
s_RD_Inventory_Manager.IncrementStrangePropertyOnEquippedItems( assert_cast< CASW_Inhabitable_NPC * >( pTarget ), 5007, 0, 0, false ); // Alien Kill Streak
CASW_Inhabitable_NPC* pInhabitableAttacker = assert_cast<CASW_Inhabitable_NPC*>( pAttacker );
if ( pInhabitableAttacker->IsInhabited() )
{
s_RD_Inventory_Manager.IncrementStrangePropertiesForWeapon( pInhabitableAttacker, pWeapon, 5002, 1 ); // Aliens Killed
s_RD_Inventory_Manager.IncrementStrangePropertiesForWeapon( pInhabitableAttacker, pWeapon, 5007, 1 ); // Alien Kill Streak
s_RD_Inventory_Manager.IncrementStrangePropertiesForWeapon( pInhabitableAttacker, pWeapon, 5010, 1 ); // Aliens Killed (Twitch)
}
}

if ( !pAttacker || !pAttacker->IsInhabitableNPC() )
if ( !V_stricmp( IGameSystem::MapName(), "rd-reduction2" )
&& !pAttacker->IsInhabitableNPC()
&& !V_strcmp( STRING( pAttacker->GetEntityName() ), "trigger_pitworm_hitbox" )
&& pTarget->IsInhabitableNPC() )
{
if ( pAttacker && pTarget && pTarget->IsInhabitableNPC() && !V_stricmp( IGameSystem::MapName(), "rd-reduction2" ) && !V_strcmp( STRING( pAttacker->GetEntityName() ), "trigger_pitworm_hitbox" ) )
CASW_Inhabitable_NPC *pTargetNPC = assert_cast< CASW_Inhabitable_NPC * >( pTarget );
if ( pTargetNPC->IsInhabited() )
{
CASW_Inhabitable_NPC *pTargetNPC = assert_cast< CASW_Inhabitable_NPC * >( pTarget );

s_RD_Inventory_Manager.IncrementStrangePropertyOnEquippedItems( pTargetNPC, 42, 1 );
#ifdef CLIENT_DLL
static bool s_bRequestedWormToucherMedal = false;
if ( !s_bRequestedWormToucherMedal && pTargetNPC->IsInhabited() && pTargetNPC->GetCommander() && pTargetNPC->GetCommander()->IsLocalPlayer() )
if ( !s_bRequestedWormToucherMedal && pTargetNPC->GetCommander() && pTargetNPC->GetCommander()->IsLocalPlayer() )
{
AddPromoItem( 42 );
s_bRequestedWormToucherMedal = true;
}
#endif

s_RD_Inventory_Manager.IncrementStrangePropertyOnEquippedItems( pTargetNPC, 42, 1 );
}

return;
}

CASW_Inhabitable_NPC *pInhabitableAttacker = assert_cast< CASW_Inhabitable_NPC * >( pAttacker );
if ( pTarget && pTarget->IsAlien() && bKilled )
{
s_RD_Inventory_Manager.IncrementStrangePropertiesForWeapon( pInhabitableAttacker, pWeapon, 5002, 1 ); // Aliens Killed
s_RD_Inventory_Manager.IncrementStrangePropertiesForWeapon( pInhabitableAttacker, pWeapon, 5007, 1 ); // Alien Kill Streak
s_RD_Inventory_Manager.IncrementStrangePropertiesForWeapon( pInhabitableAttacker, pWeapon, 5010, 1 ); // Aliens Killed (Twitch)
}
}
else
{
if ( pAttacker->IsInhabitableNPC() )
if ( bKilled && pWeapon
&& pAttacker != pTarget
&& pAttacker->IsInhabitableNPC()
&& pTarget->Classify() == (Class_T)CLASS_ASW_MARINE )
{
CASW_Inhabitable_NPC *pInhabitableAttacker = assert_cast<CASW_Inhabitable_NPC *>( pAttacker );
if ( pTarget && pTarget->Classify() == (Class_T)CLASS_ASW_MARINE && bKilled && pTarget != pInhabitableAttacker )
{
s_RD_Inventory_Manager.IncrementStrangePropertiesForWeapon( pInhabitableAttacker, pWeapon, 5009, 1 ); // Deathmatch Kills
s_RD_Inventory_Manager.IncrementStrangePropertiesForWeapon( pInhabitableAttacker, pWeapon, 5011, 1 ); // Deathmatch Kills (Twitch)
}
s_RD_Inventory_Manager.IncrementStrangePropertiesForWeapon( pInhabitableAttacker, pWeapon, 5009, 1 ); // Deathmatch Kills
s_RD_Inventory_Manager.IncrementStrangePropertiesForWeapon( pInhabitableAttacker, pWeapon, 5011, 1 ); // Deathmatch Kills (Twitch)
}
}
}
Expand Down