Skip to content

Commit 3d4635a

Browse files
committed
update: asw_bait and asw_grenade_prifle
1 parent f5be9f0 commit 3d4635a

3 files changed

Lines changed: 6 additions & 1 deletion

File tree

src/game/server/swarm/asw_bait.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
#include "asw_shareddefs.h"
88
#include "ai_senses.h"
99
#include "asw_gamerules.h"
10+
#include "func_asw_fade.h"
1011

1112
// memdbgon must be the last include file in a .cpp file!!!
1213
#include "tier0/memdbgon.h"
@@ -58,6 +59,7 @@ void CASW_Bait::Spawn( void )
5859

5960
SetCollisionGroup( ASW_COLLISION_GROUP_IGNORE_NPCS );
6061
//CreateVPhysics();
62+
CFunc_ASW_Fade::ApplyGrenadeCollisionRules( this );
6163

6264
// Tumble in air
6365
QAngle vecAngVelocity( 0, random->RandomFloat ( -100, -500 ), 0 );

src/game/server/swarm/asw_grenade_prifle.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
#include "particle_parse.h"
1313
#include "asw_player.h"
1414
#include "asw_achievements.h"
15+
#include "func_asw_fade.h"
1516

1617
// memdbgon must be the last include file in a .cpp file!!!
1718
#include "tier0/memdbgon.h"
@@ -48,6 +49,7 @@ void CASW_Grenade_PRifle::Spawn()
4849
{
4950
BaseClass::Spawn();
5051
SetModel( STUN_GRENADE_MODEL );
52+
CFunc_ASW_Fade::ApplyGrenadeCollisionRules( this );
5153
}
5254

5355
void CASW_Grenade_PRifle::Detonate()

src/game/server/swarm/func_asw_fade.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,6 @@ void CFunc_ASW_Fade::ApplyMarineCollisionRules( CBaseEntity* pMarine )
9292
}
9393
}
9494

95-
9695
void CFunc_ASW_Fade::SetGrenadeCollisionRules( inputdata_t& inputdata )
9796
{
9897
m_iCollideWithGrenades = clamp( inputdata.value.Int(), 0, 2 );
@@ -108,6 +107,8 @@ void CFunc_ASW_Fade::SetGrenadeCollisionRules( inputdata_t& inputdata )
108107
"asw_laser_mine",
109108
"asw_grenade_vindicator",
110109
"asw_gas_grenade_projectile",
110+
"asw_bait",
111+
"asw_grenade_prifle",
111112
nullptr
112113
};
113114

0 commit comments

Comments
 (0)