MapBase/source-sdk-2013-mapbase
1
0
Fork 0
mirror of https://github.com/mapbase-source/source-sdk-2013.git synced 2025-06-01 00:17:43 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'restored-content' into dev

Browse Source
This commit is contained in:
1upD 2018-11-08 22:29:42 -05:00
commit f7030b9bce
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sp/src/game/server/mod/weapon_custom_flaregun.cpp
View File

@ -112,8 +112,10 @@ void CFlaregun::PrimaryAttack( void )
Vector forward; Vector forward;
pOwner->EyeVectors( &forward ); pOwner->EyeVectors( &forward );
forward *= 1500;
pFlare->SetAbsVelocity( forward * 1500 ); // Add the player's velocity to the forward vector so that the flare follows the player's motion
pFlare->SetAbsVelocity(forward + pOwner->GetAbsVelocity());
pFlare->SetGravity(1.0f); pFlare->SetGravity(1.0f);
pFlare->SetFriction(0.85f); pFlare->SetFriction(0.85f);
pFlare->SetMoveType(MOVETYPE_FLYGRAVITY, MOVECOLLIDE_FLY_BOUNCE); pFlare->SetMoveType(MOVETYPE_FLYGRAVITY, MOVECOLLIDE_FLY_BOUNCE);
@ -150,8 +152,10 @@ void CFlaregun::SecondaryAttack( void )
Vector forward; Vector forward;
pOwner->EyeVectors( &forward ); pOwner->EyeVectors( &forward );
forward *=500;
pFlare->SetAbsVelocity( forward * 500 ); // Add the player's velocity to the forward vector so that the flare follows the player's motion
pFlare->SetAbsVelocity( forward + pOwner->GetAbsVelocity());
pFlare->SetGravity(1.0f); pFlare->SetGravity(1.0f);
pFlare->SetFriction( 0.85f ); pFlare->SetFriction( 0.85f );
pFlare->SetMoveType( MOVETYPE_FLYGRAVITY, MOVECOLLIDE_FLY_BOUNCE ); pFlare->SetMoveType( MOVETYPE_FLYGRAVITY, MOVECOLLIDE_FLY_BOUNCE );
@ -374,5 +378,5 @@ void CFlareGunProjectile::IgniteOtherIfAllowed(CBaseEntity * pOther)
CBreakableProp *pBreakable; CBreakableProp *pBreakable;
pBreakable = dynamic_cast<CBreakableProp*>(pOther); pBreakable = dynamic_cast<CBreakableProp*>(pOther);
if (pBreakable) if (pBreakable)
pBreakable->IgniteLifetime(30.0f); pBreakable->IgniteLifetime(10.0f);
} }