Skip to content

[TF2] Set the launcher of Sentry Rockets to the sentrygun #1769

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
ChaseTownsend wants to merge 2 commits into
base: master
Choose a base branch
from
+5 −4
Open

[TF2] Set the launcher of Sentry Rockets to the sentrygun #1769

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
056b8cd
Set the launcher of the Sentry rocket to Sentrygun
ChaseTownsend Jan 16, 2026
7a1ef7e
Add Launcher to tf_obj_sentrygun.h
ChaseTownsend Jan 16, 2026
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
7 changes: 4 additions & 3 deletions src/game/server/tf/tf_obj_sentrygun.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1356,7 +1356,7 @@ bool CObjectSentrygun::FireRocket()

QAngle angAimDir;
VectorAngles( vecAimDir, angAimDir );
CTFProjectile_SentryRocket *pProjectile = CTFProjectile_SentryRocket::Create( vecSrc, angAimDir, this, GetBuilder() );
CTFProjectile_SentryRocket *pProjectile = CTFProjectile_SentryRocket::Create( vecSrc, angAimDir, this, GetBuilder(), this );
if ( pProjectile )
{
int iDamage = 100;
Expand Down Expand Up @@ -2365,13 +2365,14 @@ END_NETWORK_TABLE()
//-----------------------------------------------------------------------------
// Purpose: Creation
//-----------------------------------------------------------------------------
CTFProjectile_SentryRocket *CTFProjectile_SentryRocket::Create( const Vector &vecOrigin, const QAngle &vecAngles, CBaseEntity *pOwner, CBaseEntity *pScorer )
CTFProjectile_SentryRocket *CTFProjectile_SentryRocket::Create( const Vector &vecOrigin, const QAngle &vecAngles, CBaseEntity *pOwner, CBaseEntity *pScorer, CBaseEntity *pLauncher )
{
CTFProjectile_SentryRocket *pRocket = static_cast<CTFProjectile_SentryRocket*>( CTFBaseRocket::Create( NULL, "tf_projectile_sentryrocket", vecOrigin, vecAngles, pOwner ) );
CTFProjectile_SentryRocket *pRocket = static_cast<CTFProjectile_SentryRocket*>( CTFBaseRocket::Create( pLauncher, "tf_projectile_sentryrocket", vecOrigin, vecAngles, pOwner ) );

if ( pRocket )
{
pRocket->SetScorer( pScorer );
pRocket->SetLauncher( pLauncher );
}

return pRocket;
Expand Down
2 changes: 1 addition & 1 deletion src/game/server/tf/tf_obj_sentrygun.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,7 @@ class CTFProjectile_SentryRocket : public CTFProjectile_Rocket
virtual int GetProjectileType() const OVERRIDE { return TF_PROJECTILE_SENTRY_ROCKET; }

// Creation.
static CTFProjectile_SentryRocket *Create( const Vector &vecOrigin, const QAngle &vecAngles, CBaseEntity *pOwner = NULL, CBaseEntity *pScorer = NULL );
static CTFProjectile_SentryRocket *Create( const Vector &vecOrigin, const QAngle &vecAngles, CBaseEntity *pOwner = NULL, CBaseEntity *pScorer = NULL, CBaseEntity *pLauncher = NULL );

virtual void Spawn();
};
Expand Down