Skip to content

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

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

Closed
ZehMatt wants to merge 4 commits into from
Closed

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f93b716
Fixed npc_manhack not notifying npc_template_maker/npc_maker when thr…
ZehMatt Dec 27, 2015
63ff6a7
Fixed npc_manhack not notifying npc_template_maker/npc_maker when thr…
ZehMatt Dec 27, 2015
f4c807a
Fixed infinite recursion by using incorrect key on value conversation.
ZehMatt Jun 11, 2016
3972c3f
Revert "Fixed infinite recursion by using incorrect key on value conv…
ZehMatt Jun 11, 2016
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
10 changes: 8 additions & 2 deletions mp/src/game/server/hl2/npc_manhack.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3007,6 +3007,9 @@ 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 );
Expand All @@ -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;

Expand Down
1 change: 1 addition & 0 deletions mp/src/game/server/hl2/npc_manhack.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,6 +254,7 @@ DECLARE_SERVERCLASS();
CSprite *m_pLightGlow;

CHandle<SmokeTrail> m_hSmokeTrail;
CHandle<CBaseEntity> m_pPrevOwner;

int m_iPanel1;
int m_iPanel2;
Expand Down
12 changes: 9 additions & 3 deletions sp/src/game/server/hl2/npc_manhack.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
}
Expand All @@ -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;

Expand Down
1 change: 1 addition & 0 deletions sp/src/game/server/hl2/npc_manhack.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,6 +254,7 @@ DECLARE_SERVERCLASS();
CSprite *m_pLightGlow;

CHandle<SmokeTrail> m_hSmokeTrail;
CHandle<CBaseEntity> m_pPrevOwner;

int m_iPanel1;
int m_iPanel2;
Expand Down