gameplay: fix reflect bugs and related projectile bugs

This was a doozy. I tried scanning through the codebase for
all usages and interactions to make sure everything was working
properly, and also tested the interactions.

* Fix reflected sandman balls not dealing damage
* Fix reflected ornament not dealing damage/bleed properly
* Fix Scout playing hit/miss voicelines on reflected balls
* Fix some projectile's lifetime not being tied to the reflector
* Fix reflected rescue ranger not healing buildings
* Fix reflected flares not exhibiting their correct properties
* Fix reflected flares and sticky bombs lifetimes not being tracked properly
* Fix projectiles not using the correct team color when reflected
* Fix reflected air strike not showing the correct particles
* Fix reflected sentry rockets causing flamethrower sound
* Fix reflected projectiles not dealing correct damage
* Fix reflected projectiles not having correct radius
* Fix reflected projectiles not having correct speed in some cases
* Fix reflected projectiles not contributing to buildings destroyed strange part
* Fix reflected cannonballs not double donking
* Fix sentry rockets/bullets not contributing to buildings destroyed strange part
* Fix reflected bow having incorrect push force and other effects
* Fix reflected projectiles not using the correct spells
* Fix enemy Snipers receiving extinguish bonus from reflected Jarate
* Fix kill icons for reflected ball, cleaver, flares, arrow headshot
  burning arrow, burning arrow headshot

ref: https://www.youtube.com/watch?v=EDsDnR2dzlw
ref: https://www.youtube.com/watch?v=NxeljS6GE9g
ref: ValveSoftware/Source-1-Games#4298
ref: ValveSoftware/Source-1-Games#4171
ref: ValveSoftware/Source-1-Games#3368
ref: ValveSoftware/Source-1-Games#3292

Author: mastercoms

src/game/client/tf/c_tf_projectile_flare.cpp

@@ -98,7 +98,7 @@ void C_TFProjectile_Flare::CreateTrails( void )
 
 	int nType = 0;
 
-	C_TFFlareGun *pFlareGun = dynamic_cast< C_TFFlareGun* >( GetLauncher() );
+	C_TFFlareGun *pFlareGun = dynamic_cast< C_TFFlareGun* >( GetOriginalLauncher() );
 	if ( pFlareGun )
 	{
 		nType = pFlareGun->GetFlareGunType();

src/game/client/tf/c_tf_projectile_rocket.cpp

@@ -77,7 +77,7 @@ void C_TFProjectile_Rocket::CreateTrails( void )
 		// Halloween Spell Effect Check
 		int iHalloweenSpell = 0;
 		// if the owner is a Sentry, Check its owner
-		CBaseObject *pSentry = GetOwnerEntity() && GetOwnerEntity()->IsBaseObject() ? assert_cast<CBaseObject*>( GetOwnerEntity() ) : NULL;
+		CBaseObject *pSentry = GetOriginalLauncher() && GetOriginalLauncher()->IsBaseObject() ? assert_cast<CBaseObject*>( GetOriginalLauncher() ) : NULL;
 		if ( TF_IsHolidayActive( kHoliday_HalloweenOrFullMoon ) || true )
 		{
 			if ( pSentry )
@@ -86,7 +86,7 @@ void C_TFProjectile_Rocket::CreateTrails( void )
 			}
 			else
 			{
-				CALL_ATTRIB_HOOK_INT_ON_OTHER( GetOwnerEntity(), iHalloweenSpell, halloween_pumpkin_explosions );
+				CALL_ATTRIB_HOOK_INT_ON_OTHER( GetOriginalLauncher(), iHalloweenSpell, halloween_pumpkin_explosions );
 			}
 		}
 
@@ -98,10 +98,10 @@ void C_TFProjectile_Rocket::CreateTrails( void )
 		}
 		else if ( !pSentry )
 		{
-			if ( GetLauncher() )
+			if ( GetOriginalLauncher() )
 			{
 				int iMiniRocket = 0;
-				CALL_ATTRIB_HOOK_INT_ON_OTHER( GetLauncher(), iMiniRocket, mini_rockets );
+				CALL_ATTRIB_HOOK_INT_ON_OTHER( GetOriginalLauncher(), iMiniRocket, mini_rockets );
 				if ( iMiniRocket )
 				{
 					ParticleProp()->Create( "rockettrail_airstrike", PATTACH_POINT_FOLLOW, iAttachment );

src/game/client/tf/hud_basedeathnotice.h

@@ -54,7 +54,7 @@ struct DeathNoticeItem
 
 	DeathNoticePlayer	Killer;
 	DeathNoticePlayer   Victim;
-	char		szIcon[32];		// name of icon to display
+	char		szIcon[64];		// name of icon to display
 	wchar_t		wzInfoText[32];	// any additional text to display next to icon
 	wchar_t		wzInfoTextEnd[32];	// any additional text to display next to victim name
 	CHudTexture *iconDeath;

src/game/client/tf/tf_hud_deathnotice.cpp

@@ -993,6 +993,18 @@ void CTFHudDeathNotice::OnGameEvent( IGameEvent *event, int iDeathNoticeMsg )
 				{
 					Q_strncpy( msg.szIcon, "d_huntsman_headshot", ARRAYSIZE( msg.szIcon ) );
 				}
+				else if ( FStrEq( event->GetString( "weapon" ), "huntsman_flyingburn" ) )
+				{
+					Q_strncpy( msg.szIcon, "d_huntsman_flyingburn_headshot", ARRAYSIZE( msg.szIcon ) );
+				}
+				else if ( FStrEq( event->GetString( "weapon" ), "deflect_arrow" ) )
+				{
+					Q_strncpy( msg.szIcon, "d_deflect_huntsman_headshot", ARRAYSIZE( msg.szIcon ) );
+				}
+				else if ( FStrEq( event->GetString( "weapon" ), "deflect_huntsman_flyingburn" ) )
+				{
+					Q_strncpy( msg.szIcon, "d_deflect_huntsman_flyingburn_headshot", ARRAYSIZE( msg.szIcon ) );
+				}
 				else
 				{
 					// Did this headshot penetrate something before the kill? If so, show a fancy icon
@@ -1026,7 +1038,7 @@ void CTFHudDeathNotice::OnGameEvent( IGameEvent *event, int iDeathNoticeMsg )
 
 		case TF_DMG_CUSTOM_FLYINGBURN:
 			// special-case if the player is killed from a burning arrow as the killing blow
-			Q_strncpy( msg.szIcon, "d_huntsman_flyingburn", ARRAYSIZE( msg.szIcon ) );
+			Q_strncpy( msg.szIcon, FStrEq( event->GetString( "weapon" ), "deflect_huntsman_flyingburn" ) ? "d_deflect_huntsman_flyingburn" : "d_huntsman_flyingburn", ARRAYSIZE( msg.szIcon ) );
 			msg.wzInfoText[0] = 0;
 			break;
 

src/game/server/tf/tf_obj.cpp

@@ -2469,11 +2469,16 @@ void CBaseObject::Killed( const CTakeDamageInfo &info )
 		Explode();
 	}
 
-	// Stats tracking for strange items.
-	EconEntity_OnOwnerKillEaterEvent( dynamic_cast<CEconEntity *>( info.GetWeapon() ),
-									  pScorer,
-									  GetOwner(),
-									  kKillEaterEvent_BuildingDestroyed );
+	CTFWeaponBase *pTFWeapon = GetKilleaterWeaponFromDamageInfo( &info );
+
+	if ( pTFWeapon )
+	{
+		// Stats tracking for strange items.
+		EconEntity_OnOwnerKillEaterEvent( pTFWeapon,
+										  pScorer,
+										  GetOwner(),
+										  kKillEaterEvent_BuildingDestroyed );
+	}
 
 	UTIL_Remove( this );
 }

src/game/server/tf/tf_obj_sentrygun.cpp

@@ -1359,6 +1359,7 @@ bool CObjectSentrygun::FireRocket()
 		CTFProjectile_SentryRocket *pProjectile = CTFProjectile_SentryRocket::Create( vecSrc, angAimDir, this, GetBuilder() );
 		if ( pProjectile )
 		{
+			pProjectile->SetLauncher( this );
 			int iDamage = 100;
 			CALL_ATTRIB_HOOK_INT_ON_OTHER( GetOwner(), iDamage, mult_engy_sentry_damage );
 			pProjectile->SetDamage( iDamage );

src/game/server/tf/tf_projectile_arrow.cpp

@@ -578,7 +578,7 @@ bool CTFProjectile_Arrow::StrikeTarget( mstudiobbox_t *pBox, CBaseEntity *pOther
 					}
 				}
 
-				CTakeDamageInfo info( this, pAttacker, m_hLauncher, vecVelocity, vecOrigin, GetDamage(), nDamageType, nDamageCustom );
+				CTakeDamageInfo info( this, pAttacker, GetOriginalLauncher(), vecVelocity, vecOrigin, GetDamage(), nDamageType, nDamageCustom );
 				pOther->TakeDamage( info );
 
 				// Play an impact sound.
@@ -714,7 +714,7 @@ void CTFProjectile_Arrow::BuildingHealingArrow( CBaseEntity *pOther )
 		return;
 
 	int iArrowsHealBuildings = 0;
-	CALL_ATTRIB_HOOK_INT_ON_OTHER( pAttacker, iArrowsHealBuildings, arrow_heals_buildings );
+	CALL_ATTRIB_HOOK_INT_ON_OTHER( GetOriginalLauncher(), iArrowsHealBuildings, arrow_heals_buildings );
 	if ( iArrowsHealBuildings == 0 )
 		return;
 
@@ -1210,6 +1210,8 @@ void CTFProjectile_Arrow::IncrementDeflected( void )
 		m_flTrailLife = 1.0f;
 	}
 	CreateTrail();
+
+	m_nSkin = GetArrowSkin();
 }
 
 //-----------------------------------------------------------------------------

src/game/server/tf/tf_projectile_energy_ball.cpp

@@ -334,7 +334,7 @@ void CTFProjectile_EnergyBall::Explode( trace_t *pTrace, CBaseEntity *pOther )
 			}
 		}
 
-		CTakeDamageInfo info( this, pAttacker, m_hLauncher, vec3_origin, vecOrigin, GetDamage(), GetDamageType(), GetDamageCustom() );
+		CTakeDamageInfo info( this, pAttacker, GetOriginalLauncher(), vec3_origin, vecOrigin, GetDamage(), GetDamageType(), GetDamageCustom() );
 		CTFRadiusDamageInfo radiusinfo( &info, vecOrigin, flRadius, NULL, m_bChargedShot ? TF_ROCKET_RADIUS_FOR_RJS*1.33 : TF_ROCKET_RADIUS_FOR_RJS );
 		TFGameRules()->RadiusDamage( radiusinfo );
 	}

src/game/server/tf/tf_projectile_flare.cpp

@@ -207,7 +207,8 @@ void CTFProjectile_Flare::Explode( trace_t *pTrace, CBaseEntity *pOther )
 
 	CTFPlayer *pTFVictim = ToTFPlayer( pOther );
 
-	CTFFlareGun *pFlareGun = dynamic_cast< CTFFlareGun* >( GetLauncher() );
+	CBaseEntity *pLauncher = GetOriginalLauncher();
+	CTFFlareGun *pFlareGun = dynamic_cast< CTFFlareGun* >( pLauncher );
 	if ( pFlareGun )
 	{
 		if ( pFlareGun->GetFlareGunType() == FLAREGUN_SCORCHSHOT )
@@ -228,7 +229,7 @@ void CTFProjectile_Flare::Explode( trace_t *pTrace, CBaseEntity *pOther )
 				iDamageType |= DMG_PREVENT_PHYSICS_FORCE;
 
 				// Damage the player to push them back
-				CTakeDamageInfo info( this, pAttacker, m_hLauncher, vec3_origin, vecOrigin, GetDamage(), iDamageType, m_bIsFromTaunt ? TF_DMG_CUSTOM_FLARE_PELLET : 0 );
+				CTakeDamageInfo info( this, pAttacker, pLauncher, vec3_origin, vecOrigin, GetDamage(), iDamageType, m_bIsFromTaunt ? TF_DMG_CUSTOM_FLARE_PELLET : TF_DMG_CUSTOM_BURNING_FLARE );
 				pTFVictim->TakeDamage( info );
 
 				bool bIsEnemy = pAttacker && pTFVictim->GetTeamNumber() != pAttacker->GetTeamNumber();
@@ -329,7 +330,7 @@ void CTFProjectile_Flare::Explode( trace_t *pTrace, CBaseEntity *pOther )
 		m_bCritical = true;
 	}
 
-	CTakeDamageInfo info( this, pAttacker, m_hLauncher, vec3_origin, vecOrigin, GetDamage(), GetDamageType(), TF_DMG_CUSTOM_BURNING_FLARE );
+	CTakeDamageInfo info( this, pAttacker, pLauncher, vec3_origin, vecOrigin, GetDamage(), GetDamageType(), TF_DMG_CUSTOM_BURNING_FLARE );
 	pOther->TakeDamage( info );
 
 	// Remove the flare.
@@ -380,7 +381,7 @@ void CTFProjectile_Flare::Explode_Air( trace_t *pTrace, int bitsDamageType, bool
 	WeaponSound_t nSound = SPECIAL1;
 	if ( pAttacker )
 	{
-		CTFFlareGun *pFlareGun = dynamic_cast<CTFFlareGun*>( ToTFPlayer( pAttacker )->GetActiveWeapon() );
+		CTFFlareGun *pFlareGun = dynamic_cast<CTFFlareGun*>( GetOriginalLauncher() );
 		if ( pFlareGun )
 		{
 			CEconItemView *pItem = pFlareGun->GetAttributeContainer()->GetItem();
@@ -410,7 +411,7 @@ void CTFProjectile_Flare::Explode_Air( trace_t *pTrace, int bitsDamageType, bool
 			DrawRadius( flRadius );
 		}
 #endif
-		CTakeDamageInfo info( this, pAttacker, m_hLauncher, vec3_origin, vecOrigin, GetDamage(), bitsDamageType | DMG_HALF_FALLOFF, TF_DMG_CUSTOM_FLARE_EXPLOSION );
+		CTakeDamageInfo info( this, pAttacker, GetOriginalLauncher(), vec3_origin, vecOrigin, GetDamage(), bitsDamageType | DMG_HALF_FALLOFF, TF_DMG_CUSTOM_FLARE_EXPLOSION );
 		CTFRadiusDamageInfo radiusinfo( &info, vecOrigin, flRadius, NULL, TF_FLARE_RADIUS_FOR_FJS );
 		TFGameRules()->RadiusDamage( radiusinfo );
 	}
@@ -446,7 +447,7 @@ void CTFProjectile_Flare::Detonate( bool bSelfOnly )
 float CTFProjectile_Flare::GetRadius( void ) 
 { 
 	float flRadius = TF_FLARE_DET_RADIUS;
-	CALL_ATTRIB_HOOK_FLOAT_ON_OTHER( m_hLauncher, flRadius, mult_explosion_radius );
+	CALL_ATTRIB_HOOK_FLOAT_ON_OTHER( GetOriginalLauncher(), flRadius, mult_explosion_radius );
 	return flRadius; 
 }
 
@@ -459,7 +460,7 @@ void CTFProjectile_Flare::SendDeathNotice( void )
 	if ( !pAttacker )
 		return;
 
-	CTFFlareGun *pFlareGun = dynamic_cast<CTFFlareGun*>( ToTFPlayer( pAttacker )->GetActiveWeapon() );
+	CTFFlareGun *pFlareGun = dynamic_cast<CTFFlareGun*>( GetOriginalLauncher() );
 	if ( pFlareGun && pFlareGun->GetFlareGunType() == FLAREGUN_DETONATE )
 	{
 		pFlareGun->DeathNotice( this );
@@ -606,20 +607,22 @@ void CTFProjectile_Flare::Deflected( CBaseEntity *pDeflectedBy, Vector &vecDir )
 
 	IncrementDeflected();
 	SetScorer( pTFDeflector );
+
+	m_nSkin = ( GetTeamNumber() == TF_TEAM_BLUE ) ? 1 : 0;
 }
 
 float CTFProjectile_Flare::GetProjectileSpeed( void ) const
 {
 	float flLaunchSpeed = FLARE_SPEED;
-	CALL_ATTRIB_HOOK_FLOAT_ON_OTHER( m_hLauncher, flLaunchSpeed, mult_projectile_speed );
+	CALL_ATTRIB_HOOK_FLOAT_ON_OTHER( GetOriginalLauncher(), flLaunchSpeed, mult_projectile_speed );
 
 	return flLaunchSpeed;
 }
 
 float CTFProjectile_Flare::GetHeatSeekPower( void ) const
 {
 	float flHeatSeekPower = 0.0;
-	CALL_ATTRIB_HOOK_FLOAT_ON_OTHER( m_hLauncher, flHeatSeekPower, mod_projectile_heat_seek_power );
+	CALL_ATTRIB_HOOK_FLOAT_ON_OTHER( GetOriginalLauncher(), flHeatSeekPower, mod_projectile_heat_seek_power );
 
 	return flHeatSeekPower;
 }

src/game/shared/baseprojectile.cpp

@@ -14,8 +14,10 @@ IMPLEMENT_NETWORKCLASS_ALIASED( BaseProjectile, DT_BaseProjectile )
 BEGIN_NETWORK_TABLE( CBaseProjectile, DT_BaseProjectile )
 #if !defined( CLIENT_DLL )
 	SendPropEHandle( SENDINFO( m_hOriginalLauncher ) ),
+	SendPropEHandle( SENDINFO( m_hLauncher ) ),
 #else
 	RecvPropEHandle( RECVINFO( m_hOriginalLauncher ) ),
+	RecvPropEHandle( RECVINFO( m_hLauncher ) ),
 #endif // CLIENT_DLL
 END_NETWORK_TABLE()
 
@@ -44,6 +46,8 @@ CBaseProjectile::CBaseProjectile()
 //-----------------------------------------------------------------------------
 void CBaseProjectile::SetLauncher( CBaseEntity *pLauncher )
 {
+	m_hLauncher = pLauncher;
+
 	if ( m_hOriginalLauncher == NULL )
 	{
 		m_hOriginalLauncher = pLauncher;