Skip to content

[HL2MP] Fix items in MP conflicting with some SP behavior #464

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

Open
wants to merge 2 commits into
base: mapbase-mp-2025
Choose a base branch
from
Open

[HL2MP] Fix items in MP conflicting with some SP behavior #464

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
975e630
Fix NPC-dropped items respawning in HL2MP
Blixibon Aug 27, 2025
d7b6f77
Fix CItem::ActivateWhenAtRest() conflicting HL2MP FallThink
Blixibon Aug 27, 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
13 changes: 13 additions & 0 deletions src/game/server/ai_basenpc.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12156,6 +12156,19 @@ CBaseEntity *CAI_BaseNPC::DropItem ( const char *pszItemName, Vector vecPos, QAn
m_OnItemDrop.Set( pItem, pItem, this );
#endif

#ifdef MAPBASE_MP
// Fixes health vials, grenades, etc. respawning
if (pItem->IsCombatItem())
{
pItem->AddSpawnFlags( SF_NORESPAWN );
}
else if (pItem->IsBaseCombatWeapon())
{
// Adding SF_NORESPAWN directly to weapons causes them to be considered level-placed, which we don't want
pItem->MyCombatWeaponPointer()->Drop( vec3_origin );
}
#endif

return pItem;
}
else
Expand Down
13 changes: 13 additions & 0 deletions src/game/server/item_world.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,8 +248,13 @@ void CItem::ActivateWhenAtRest( float flTime /* = 0.5f */ )
{
RemoveSolidFlags( FSOLID_TRIGGER );
m_bActivateWhenAtRest = true;
#if defined( HL2MP ) && defined( MAPBASE_MP )
// HL2 entities (e.g. item_item_crate) often use ActivateWhenAtRest() before spawn, which is overridden by FallThink() in MP
SetContextThink( &CItem::ComeToRest, gpGlobals->curtime + flTime, "ComeToRestThink" );
#else
SetThink( &CItem::ComeToRest );
SetNextThink( gpGlobals->curtime + flTime );
#endif
}


Expand All @@ -266,8 +271,12 @@ void CItem::OnEntityEvent( EntityEvent_t event, void *pEventData )
{
// Delay rest for a sec, to avoid changing collision
// properties inside a collision callback.
#if defined( HL2MP ) && defined( MAPBASE_MP )
SetContextThink( &CItem::ComeToRest, gpGlobals->curtime + 0.1f, "ComeToRestThink" );
#else
SetThink( &CItem::ComeToRest );
SetNextThink( gpGlobals->curtime + 0.1f );
#endif
}
break;
}
Expand All @@ -283,7 +292,11 @@ void CItem::ComeToRest( void )
{
m_bActivateWhenAtRest = false;
AddSolidFlags( FSOLID_TRIGGER );
#if defined( HL2MP ) && defined( MAPBASE_MP )
SetContextThink( NULL, TICK_NEVER_THINK, "ComeToRestThink" );
#else
SetThink( NULL );
#endif
}
}

Expand Down
Loading