valve/source-sdk-2013
0
0
Fork 0
mirror of https://github.com/ValveSoftware/source-sdk-2013.git synced 2025-04-06 18:12:14 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixed npc_manhack not notifying npc_template_maker/npc_maker when thrown and destroyed with gravity gun.

Browse source
This commit is contained in:
ZehM4tt 2015-12-27 02:15:31 +01:00
parent f93b716fc7
commit 63ff6a7211
2 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
sp/src/game/server/hl2/npc_manhack.cpp
View file

@ -3007,9 +3007,12 @@ void CNPC_Manhack::OnPhysGunPickup( CBasePlayer *pPhysGunUser, PhysGunPickup_t r
}
else
{
// FIX: Remember the current owner in case we are from a npc_template_maker/npc_maker.
m_pPrevOwner.Set(GetOwnerEntity());
// Suppress collisions between the manhack and the player; we're currently bumping
// almost certainly because it's not purely a physics object.
SetOwnerEntity( pPhysGunUser );
SetOwnerEntity(pPhysGunUser);
m_bHeld = true;
}
}
@ -3022,8 +3025,11 @@ void CNPC_Manhack::OnPhysGunPickup( CBasePlayer *pPhysGunUser, PhysGunPickup_t r
//-----------------------------------------------------------------------------
void CNPC_Manhack::OnPhysGunDrop( CBasePlayer *pPhysGunUser, PhysGunDrop_t Reason )
{
// Stop suppressing collisions between the manhack and the player
SetOwnerEntity( NULL );
// Stop suppressing collisions between the manhack and the player
SetOwnerEntity(m_pPrevOwner.Get());
// Reset previous owner back to NULL.
m_pPrevOwner.Set(NULL);
m_bHeld = false;

1
sp/src/game/server/hl2/npc_manhack.h
View file

@ -254,6 +254,7 @@ private:
CSprite *m_pLightGlow;
CHandle<SmokeTrail> m_hSmokeTrail;
CHandle<CBaseEntity> m_pPrevOwner;
int m_iPanel1;
int m_iPanel2;