ValveSoftware/source-sdk-2013
1
0
Fork 1
mirror of https://github.com/ValveSoftware/source-sdk-2013.git synced 2026-08-03 20:24:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

improve heal target selection for mediguns

Browse Source
This commit is contained in:
wget
2026-01-17 21:06:36 +08:00
committed by EricS-Valve
parent 9f0fe612cf
commit 8908a11baa
1 changed files with 22 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/game/shared/tf/tf_weapon_medigun.cpp
+22 -7
View File
@@ -682,7 +682,7 @@ void CWeaponMedigun::MaintainTargetInSlot()
pOwner->EyeVectors( &vecAiming );
Vector vecEnd = vecSrc + vecAiming * GetTargetRange();
UTIL_TraceLine( vecSrc, vecEnd, (MASK_SHOT & ~CONTENTS_HITBOX), pOwner, DMG_GENERIC, &tr );
UTIL_TraceLine( vecSrc, vecEnd, (MASK_SHOT & ~CONTENTS_HITBOX), pOwner, COLLISION_GROUP_NONE, &tr );
// Still visible?
if ( tr.m_pEnt == pTarget )
@@ -729,24 +729,39 @@ void CWeaponMedigun::FindNewTargetForSlot()
// Find a player in range of this player, and make sure they're healable.
Vector vecEnd = vecSrc + vecAiming * GetTargetRange();
trace_t tr;
// for leniency, trace for hull instead of hitboxes first
UTIL_TraceLine( vecSrc, vecEnd, (MASK_SHOT & ~CONTENTS_HITBOX), pOwner, COLLISION_GROUP_NONE, &tr );
UTIL_TraceLine( vecSrc, vecEnd, (MASK_SHOT & ~CONTENTS_HITBOX), pOwner, DMG_GENERIC, &tr );
if ( tr.fraction != 1.0 && tr.m_pEnt )
{
if ( !HealingTarget( tr.m_pEnt ) && AllowedToHealTarget( tr.m_pEnt ) )
CBaseEntity *pTarget = tr.m_pEnt;
// trace again but for hitboxes to help with selecting targets that are clumped together
UTIL_TraceLine( vecSrc, vecEnd, MASK_SHOT, pOwner, COLLISION_GROUP_NONE, &tr );
if ( tr.fraction != 1.0 && tr.m_pEnt && tr.m_pEnt != pTarget && !HealingTarget( tr.m_pEnt ) && AllowedToHealTarget( tr.m_pEnt ) )
{
pTarget = tr.m_pEnt;
}
else if ( HealingTarget( pTarget ) || !AllowedToHealTarget( pTarget ) )
{
pTarget = NULL;
}
if ( pTarget )
{
#ifdef GAME_DLL
pOwner->SpeakConceptIfAllowed( MP_CONCEPT_MEDIC_STARTEDHEALING );
if ( tr.m_pEnt->IsPlayer() )
if ( pTarget->IsPlayer() )
{
CTFPlayer *pTarget = ToTFPlayer( tr.m_pEnt );
pTarget->SpeakConceptIfAllowed( MP_CONCEPT_HEALTARGET_STARTEDHEALING );
CTFPlayer *pTFPlayer = ToTFPlayer( pTarget );
pTFPlayer->SpeakConceptIfAllowed( MP_CONCEPT_HEALTARGET_STARTEDHEALING );
}
// Start the heal target thinking.
SetContextThink( &CWeaponMedigun::HealTargetThink, gpGlobals->curtime, s_pszMedigunHealTargetThink );
#endif
m_hHealingTarget.Set( tr.m_pEnt );
m_hHealingTarget.Set( pTarget );
m_flNextTargetCheckTime = gpGlobals->curtime + 1.0f;
}
}