Skip to content

[TF2] fix dragon's fury fireballs having incorrect projectile path #1746

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

Open
wgetJane wants to merge 1 commit into
base: master
Choose a base branch
from
+13 −16
Open

[TF2] fix dragon's fury fireballs having incorrect projectile path #1746

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
29 changes: 13 additions & 16 deletions src/game/shared/tf/tf_weapon_dragons_fury.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
#endif

extern ConVar tf_flamethrower_burstammo;

extern ConVar tf_fireball_distance;

//=============================================================================
//
Expand Down Expand Up @@ -144,24 +144,19 @@ CBaseEntity* CTFWeaponFlameBall::FireProjectile( CTFPlayer *pPlayer )
RemoveProjectileAmmo( pPlayer );

#ifdef GAME_DLL
QAngle angForward = pPlayer->EyeAngles();

Vector vecForward, vecRight, vecUp;
AngleVectors( pPlayer->EyeAngles(), &vecForward, &vecRight, &vecUp );
AngleVectors( angForward, &vecForward, &vecRight, &vecUp );

float fRight = 8.f;
float fRight = 7.0f;
if ( IsViewModelFlipped() )
{
fRight *= -1;
}
Vector vecSrc = pPlayer->Weapon_ShootPosition();
Vector vecShootPos = pPlayer->Weapon_ShootPosition();
// Shoot from the right location
vecSrc = vecSrc + (vecUp * -9.0f) + (vecRight * 7.0f) + (vecForward * 3.0f);

QAngle angForward = pPlayer->EyeAngles();

trace_t trace;
Vector vecEye = pPlayer->EyePosition();
CTraceFilterSimple traceFilter( this, COLLISION_GROUP_NONE );
UTIL_TraceHull( vecEye, vecSrc, -Vector(8,8,8), Vector(8,8,8), MASK_SOLID_BRUSHONLY, &traceFilter, &trace );
Vector vecSrc = vecShootPos + ( vecUp * -9.0f ) + ( vecRight * fRight ) + ( vecForward * 3.0f );

CTFProjectile_Rocket *pRocket = static_cast<CTFProjectile_Rocket*>( CBaseEntity::CreateNoSpawn( "tf_projectile_balloffire", vecSrc, angForward, pPlayer ) );
if ( pRocket )
Expand All @@ -171,12 +166,14 @@ CBaseEntity* CTFWeaponFlameBall::FireProjectile( CTFPlayer *pPlayer )
DoFireEffects();

pRocket->SetOwnerEntity( pPlayer );
pRocket->SetLauncher( this );
pRocket->SetLauncher( this );

float flEndDist = tf_fireball_distance.GetFloat();

Vector vForward;
AngleVectors( angForward, &vForward, NULL, NULL );
Vector vecProjForward = ( vecShootPos + vecForward * flEndDist ) - vecSrc;
VectorNormalize( vecProjForward );

pRocket->SetAbsVelocity( vForward * 600 );
pRocket->SetAbsVelocity( vecProjForward * 600 );

pRocket->SetDamage( 20 );
pRocket->ChangeTeam( pPlayer->GetTeamNumber() );
Expand Down