Skip to content

Commit a516b15

Browse files
committed
use shared GetSentryGunInflictor
1 parent 6ba75af commit a516b15

2 files changed

Lines changed: 6 additions & 3 deletions

File tree

src/game/server/tf/tf_projectile_rocket.cpp

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@
77
#include "cbase.h"
88
#include "tf_weaponbase.h"
99
#include "tf_projectile_rocket.h"
10+
11+
#include "tf_gamerules.h"
12+
#include "tf_obj_sentrygun.h"
1013
#include "tf_player.h"
1114

1215
//=============================================================================
@@ -154,9 +157,9 @@ void CTFProjectile_Rocket::Deflected( CBaseEntity *pDeflectedBy, Vector &vecDir
154157
SetLauncher( pTFDeflector->GetActiveWeapon() );
155158

156159
CTFPlayer *pOldOwner = ToTFPlayer( GetOwnerEntity() );
157-
if ( pOldOwner == nullptr )
160+
if ( !pOldOwner )
158161
{
159-
CBaseObject *pBaseObject = dynamic_cast< CBaseObject* >( GetOwnerEntity() );
162+
CObjectSentrygun *pBaseObject = TFGameRules()->GetSentryGunInflictor( this );
160163
if ( pBaseObject && pBaseObject->GetOwner() )
161164
{
162165
pOldOwner = ToTFPlayer( pBaseObject->GetOwner() );

src/game/shared/tf/tf_gamerules.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14190,7 +14190,7 @@ CTFPlayer *CTFGameRules::GetRecentDamager( CTFPlayer *pVictim, int iDamager, flo
1419014190
return NULL;
1419114191
}
1419214192

14193-
CObjectSentrygun *CTFGameRules::GetSentryGunInflictor(CBaseEntity *pInflictor)
14193+
CObjectSentrygun *CTFGameRules::GetSentryGunInflictor( CBaseEntity *pInflictor )
1419414194
{
1419514195
// safety
1419614196
if ( !pInflictor )

0 commit comments

Comments
 (0)