Merge branch 'restored-content' of https://github.com/1upD/source-sdk-2013 into dev

This commit is contained in:
1upD 2018-11-05 23:28:38 -05:00
commit 7d8aa4211d

View File

@ -657,8 +657,6 @@ void CFlare::AddToActiveFlares( void )
} }
} }
#if 0
IMPLEMENT_SERVERCLASS_ST(CFlaregun, DT_Flaregun) IMPLEMENT_SERVERCLASS_ST(CFlaregun, DT_Flaregun)
END_SEND_TABLE() END_SEND_TABLE()
@ -750,6 +748,4 @@ void CFlaregun::SecondaryAttack( void )
pFlare->SetMoveType( MOVETYPE_FLYGRAVITY, MOVECOLLIDE_FLY_BOUNCE ); pFlare->SetMoveType( MOVETYPE_FLYGRAVITY, MOVECOLLIDE_FLY_BOUNCE );
WeaponSound( SINGLE ); WeaponSound( SINGLE );
} }
#endif