polishing

Kitsune44 · Kitsune44 · commit dd23db8e78dc · 2025-10-16T13:32:25.000+02:00
diff --git a/src/game/server/hl2/grenade_spit.cpp b/src/game/server/hl2/grenade_spit.cpp
@@ -71,7 +71,7 @@ void CGrenadeSpit::Spawn( void )
 	SetFriction( 0.8f );
 
 	SetCollisionGroup( ASW_COLLISION_GROUP_NPC_GRENADES );
-	CFunc_ASW_Fade::DisableCollisionsWithGrenade( this );
+	CFunc_ASW_Fade::ApplyGrenadeCollisionRules( this );
 
 	AddEFlags( EFL_FORCE_CHECK_TRANSMIT );
 
diff --git a/src/game/server/hl2/npc_zombine.cpp b/src/game/server/hl2/npc_zombine.cpp
@@ -379,7 +379,7 @@ void CNPC_Zombine::DropGrenade( Vector vDir )
 		m_hGrenade->SetMoveType( MOVETYPE_VPHYSICS );
 		m_hGrenade->SetSolid( SOLID_VPHYSICS );
 		m_hGrenade->SetCollisionGroup( ASW_COLLISION_GROUP_GRENADES );
-		CFunc_ASW_Fade::DisableCollisionsWithGrenade( m_hGrenade );
+		CFunc_ASW_Fade::ApplyGrenadeCollisionRules( m_hGrenade );
 
 		m_hGrenade->CreateVPhysics();
 	}
diff --git a/src/game/server/swarm/asw_flare_projectile.cpp b/src/game/server/swarm/asw_flare_projectile.cpp
@@ -162,7 +162,7 @@ void CASW_Flare_Projectile::Spawn( void )
 	AddFlag( FL_OBJECT );
 	
 	SetCollisionGroup( ASW_COLLISION_GROUP_GRENADES );
-	CFunc_ASW_Fade::DisableCollisionsWithGrenade( this );
+	CFunc_ASW_Fade::ApplyGrenadeCollisionRules( this );
 
 	// Tumble in air
 	QAngle vecAngVelocity( 0, random->RandomFloat ( -100, -500 ), 0 );
diff --git a/src/game/server/swarm/asw_gas_grenade_projectile.cpp b/src/game/server/swarm/asw_gas_grenade_projectile.cpp
@@ -104,7 +104,7 @@ void CASW_Gas_Grenade_Projectile::Spawn( void )
 	
 	SetCollisionGroup( ASW_COLLISION_GROUP_IGNORE_NPCS );
 
-	CFunc_ASW_Fade::DisableCollisionsWithGrenade( this );
+	CFunc_ASW_Fade::ApplyGrenadeCollisionRules( this );
 
 	// Tumble in air
 	QAngle vecAngVelocity( 0, random->RandomFloat ( -100, -500 ), 0 );
diff --git a/src/game/server/swarm/asw_grenade_cluster.cpp b/src/game/server/swarm/asw_grenade_cluster.cpp
@@ -100,7 +100,7 @@ void CASW_Grenade_Cluster::Spawn( void )
 	SetFriction( asw_vindicator_grenade_friction.GetFloat() );
 	SetElasticity( asw_vindicator_grenade_elasticity.GetFloat() );
 	SetCollisionGroup( ASW_COLLISION_GROUP_GRENADES );
-	CFunc_ASW_Fade::DisableCollisionsWithGrenade( this );
+	CFunc_ASW_Fade::ApplyGrenadeCollisionRules( this );
 
 	SetTouch( &CASW_Grenade_Cluster::VGrenadeTouch );
 
diff --git a/src/game/server/swarm/asw_grenade_vindicator.cpp b/src/game/server/swarm/asw_grenade_vindicator.cpp
@@ -95,7 +95,7 @@ void CASW_Grenade_Vindicator::Spawn( void )
 	SetFriction( asw_vindicator_grenade_friction.GetFloat() );
 	SetElasticity( asw_vindicator_grenade_elasticity.GetFloat() );
 	SetCollisionGroup( ASW_COLLISION_GROUP_GRENADES );
-	CFunc_ASW_Fade::DisableCollisionsWithGrenade( this );
+	CFunc_ASW_Fade::ApplyGrenadeCollisionRules( this );
 	//CreateVPhysics();
 
 	SetTouch( &CASW_Grenade_Vindicator::VGrenadeTouch );
diff --git a/src/game/server/swarm/asw_laser_mine.cpp b/src/game/server/swarm/asw_laser_mine.cpp
@@ -82,7 +82,7 @@ void CASW_Laser_Mine::Spawn( void )
 
 	AddEffects( EF_NOSHADOW | EF_NORECEIVESHADOW );
 	SetCollisionGroup( ASW_COLLISION_GROUP_GRENADES );
-	CFunc_ASW_Fade::DisableCollisionsWithGrenade( this );
+	CFunc_ASW_Fade::ApplyGrenadeCollisionRules( this );
 
 	SetThink( &CASW_Laser_Mine::LaserThink );
 	SetNextThink( gpGlobals->curtime + 0.1f );
diff --git a/src/game/server/swarm/asw_marine.cpp b/src/game/server/swarm/asw_marine.cpp
@@ -890,7 +890,7 @@ void CASW_Marine::Spawn( void )
 
 	UTIL_SetSize( this, GetHullMins(), GetHullMaxs() );
 
-	CFunc_ASW_Fade::DisableCollisionsWithMarine( this );
+	CFunc_ASW_Fade::ApplyMarineCollisionRules( this );
 }
 
 unsigned int CASW_Marine::PhysicsSolidMaskForEntity( void ) const 
diff --git a/src/game/server/swarm/asw_mine.cpp b/src/game/server/swarm/asw_mine.cpp
@@ -56,7 +56,7 @@ void CASW_Mine::Spawn( void )
 	SetSolid( SOLID_BBOX );
 	AddSolidFlags( FSOLID_TRIGGER );
 	SetCollisionGroup( ASW_COLLISION_GROUP_GRENADES );
-	CFunc_ASW_Fade::DisableCollisionsWithGrenade( this );
+	CFunc_ASW_Fade::ApplyGrenadeCollisionRules( this );
 	SetMoveType( MOVETYPE_FLYGRAVITY );
 	m_takedamage	= DAMAGE_NO;
 	m_bPrimed = false;
diff --git a/src/game/server/swarm/asw_rocket.cpp b/src/game/server/swarm/asw_rocket.cpp
@@ -103,7 +103,7 @@ void CASW_Rocket::Spawn( void )
 	SetTouch( &CASW_Rocket::MissileTouch );
 
 	SetCollisionGroup( ASW_COLLISION_GROUP_PLAYER_MISSILE );
-	CFunc_ASW_Fade::DisableCollisionsWithGrenade( this );
+	CFunc_ASW_Fade::ApplyGrenadeCollisionRules( this );
 	SetMoveType( MOVETYPE_FLYGRAVITY, MOVECOLLIDE_FLY_BOUNCE );
 	SetThink( &CASW_Rocket::IgniteThink );
 	
diff --git a/src/game/server/swarm/func_asw_fade.cpp b/src/game/server/swarm/func_asw_fade.cpp
@@ -16,8 +16,8 @@ BEGIN_DATADESC( CFunc_ASW_Fade )
 	DEFINE_KEYFIELD( m_iCollideWithGrenades, FIELD_CHARACTER, "CollideWithGrenades" ),
 	DEFINE_KEYFIELD( m_bCollideWithMarines, FIELD_BOOLEAN, "CollideWithMarines" ),
 	DEFINE_INPUT( m_bAllowFade, FIELD_BOOLEAN, "AllowFade" ),
-	DEFINE_INPUTFUNC( FIELD_INTEGER, "SetCollideWithGrenades", InputSetCollideWithGrenades ),
-	DEFINE_INPUTFUNC( FIELD_BOOLEAN, "SetCollideWithMarines", InputSetCollideWithMarines ),
+	DEFINE_INPUTFUNC( FIELD_INTEGER, "SetCollideWithGrenades", SetGrenadeCollisionRules ),
+	DEFINE_INPUTFUNC( FIELD_BOOLEAN, "SetCollideWithMarines", SetMarineCollisionRules ),
 END_DATADESC()
 
 IMPLEMENT_SERVERCLASS_ST( CFunc_ASW_Fade, DT_Func_ASW_Fade )
@@ -45,7 +45,7 @@ void CFunc_ASW_Fade::Spawn()
 	Assert( m_iCollideWithGrenades <= 2 );
 }
 
-void CFunc_ASW_Fade::DisableCollisionsWithGrenade( CBaseEntity* pGrenade )
+void CFunc_ASW_Fade::ApplyGrenadeCollisionRules( CBaseEntity* pGrenade )
 {
 	const float flGrenadeZ = pGrenade->GetAbsOrigin().z;
 	const string_t iszClassName = AllocPooledString( "func_asw_fade" );
@@ -71,7 +71,7 @@ void CFunc_ASW_Fade::DisableCollisionsWithGrenade( CBaseEntity* pGrenade )
 	}
 }
 
-void CFunc_ASW_Fade::DisableCollisionsWithMarine( CBaseEntity* pMarine )
+void CFunc_ASW_Fade::ApplyMarineCollisionRules( CBaseEntity* pMarine )
 {
 	const string_t iszClassName = AllocPooledString( "func_asw_fade" );
 
@@ -94,7 +94,7 @@ void CFunc_ASW_Fade::DisableCollisionsWithMarine( CBaseEntity* pMarine )
 }
 
 
-void CFunc_ASW_Fade::InputSetCollideWithGrenades( inputdata_t& inputdata )
+void CFunc_ASW_Fade::SetGrenadeCollisionRules( inputdata_t& inputdata )
 {
 	m_iCollideWithGrenades = clamp( inputdata.value.Int(), 0, 2 );
 
@@ -117,19 +117,19 @@ void CFunc_ASW_Fade::InputSetCollideWithGrenades( inputdata_t& inputdata )
 		CBaseEntity* pGrenade = NULL;
 		while ( ( pGrenade = gEntList.FindEntityByClassname( pGrenade, *pszClass ) ) != NULL )
 		{
-			DisableCollisionsWithGrenade( pGrenade );
+			ApplyGrenadeCollisionRules( pGrenade );
 		}
 	}
 }
 
-void CFunc_ASW_Fade::InputSetCollideWithMarines( inputdata_t& inputdata )
+void CFunc_ASW_Fade::SetMarineCollisionRules( inputdata_t& inputdata )
 {
 	m_bCollideWithMarines = !!inputdata.value.Int();
 
 	CBaseEntity* pMarine = NULL;
 	while ( ( pMarine = gEntList.FindEntityByClassname( pMarine, "asw_marine" ) ) != NULL )
 	{
-		DisableCollisionsWithMarine( pMarine );
+		ApplyMarineCollisionRules( pMarine );
 	}
 }
 
diff --git a/src/game/server/swarm/func_asw_fade.h b/src/game/server/swarm/func_asw_fade.h
@@ -21,11 +21,11 @@ class CFunc_ASW_Fade : public CFuncBrush
 	virtual void Spawn() override;
 	bool ShouldFade( CASW_Inhabitable_NPC *pNPC );
 
-	static void DisableCollisionsWithGrenade( CBaseEntity *pGrenade );
-	static void DisableCollisionsWithMarine( CBaseEntity *pMarine );
+	static void ApplyGrenadeCollisionRules( CBaseEntity *pGrenade );
+	static void ApplyMarineCollisionRules( CBaseEntity *pMarine );
 
-	void InputSetCollideWithGrenades( inputdata_t& inputdata );
-	void InputSetCollideWithMarines( inputdata_t& inputdata );
+	void SetGrenadeCollisionRules( inputdata_t& inputdata );
+	void SetMarineCollisionRules( inputdata_t& inputdata );
 
 	CNetworkVar( bool, m_bHasProxies );
 	// 0 = only when grenade spawns above the brush
diff --git a/src/game/shared/swarm/asw_missile_round_shared.cpp b/src/game/shared/swarm/asw_missile_round_shared.cpp
@@ -95,7 +95,7 @@ void CASW_Missile_Round::Spawn( void )
 	SetSolid( SOLID_NONE );
 	SetGravity( m_ShotDef.m_flGravity );
 	SetCollisionGroup( ASW_COLLISION_GROUP_ALIEN_MISSILE );
-	CFunc_ASW_Fade::DisableCollisionsWithGrenade( this );
+	CFunc_ASW_Fade::ApplyGrenadeCollisionRules( this );
 
 	SetTouch( &CASW_Missile_Round::Touch );
 

Original file line number	Diff line number	Diff line change
`@@ -379,7 +379,7 @@ void CNPC_Zombine::DropGrenade( Vector vDir )`
`379`	`379`	`m_hGrenade->SetMoveType( MOVETYPE_VPHYSICS );`
`380`	`380`	`m_hGrenade->SetSolid( SOLID_VPHYSICS );`
`381`	`381`	`m_hGrenade->SetCollisionGroup( ASW_COLLISION_GROUP_GRENADES );`
`382`		`- CFunc_ASW_Fade::DisableCollisionsWithGrenade( m_hGrenade );`
	`382`	`+ CFunc_ASW_Fade::ApplyGrenadeCollisionRules( m_hGrenade );`
`383`	`383`
`384`	`384`	`m_hGrenade->CreateVPhysics();`
`385`	`385`	`}`
Original file line number	Diff line number	Diff line change
`@@ -890,7 +890,7 @@ void CASW_Marine::Spawn( void )`
`890`	`890`
`891`	`891`	`UTIL_SetSize( this, GetHullMins(), GetHullMaxs() );`
`892`	`892`
`893`		`- CFunc_ASW_Fade::DisableCollisionsWithMarine( this );`
	`893`	`+ CFunc_ASW_Fade::ApplyMarineCollisionRules( this );`
`894`	`894`	`}`
`895`	`895`
`896`	`896`	`unsigned int CASW_Marine::PhysicsSolidMaskForEntity( void ) const`