func_asw_fade: add runtime IO inputs for CollideWithGrenades and CollideWithMarines

Author: Kitsune44

reactivedrop/fgd/reactivedrop.fgd

@@ -149,6 +149,8 @@
 	input SetExcluded( string ) : "Change the NPC class excluded from collisions"
 	input SetInvert( integer ) : "Set the state of inversion for NPC class exclusion (0 or 1)"
 	input AllowFade( integer ) : "Enable or disable fading (0 or 1)"
+	input CollideWithGrenades( integer ) : "Change CollideWithGrenades at runtime (0, 1 or 2)"
+	input CollideWithMarines( integer ) : "Change CollideWithMarines at runtime (0 or 1)"
 ]
 
 @PointClass base(prop_dynamic_base, EnableDisable) sphere(fademindist) sphere(fademaxdist) studioprop() = prop_asw_fade :

src/game/client/swarm/c_func_asw_fade.cpp

@@ -6,6 +6,7 @@
 
 IMPLEMENT_CLIENTCLASS_DT( C_Func_ASW_Fade, DT_Func_ASW_Fade, CFunc_ASW_Fade )
 	RecvPropInt( RECVINFO( m_nFadeOpacity ) ),
+    RecvPropInt( RECVINFO( m_iCollideWithGrenades ) ),
 	RecvPropBool( RECVINFO( m_bAllowFade ) ),
 	RecvPropBool( RECVINFO( m_bHasProxies ) ),
 	RecvPropBool( RECVINFO( m_bCollideWithMarines ) ),

src/game/client/swarm/c_func_asw_fade.h

@@ -17,6 +17,7 @@ class C_Func_ASW_Fade : public C_FuncBrush, public IASW_Fade_List
 
 	IMPLEMENT_ASW_FADE_LIST( GetAbsOrigin() );
 	CNetworkVar( bool, m_bCollideWithMarines );
+    CNetworkVar( byte, m_iCollideWithGrenades );
 };
 
 #endif	// _INCLUDED_C_FUNC_ASW_FADE_H

src/game/server/swarm/func_asw_fade.cpp

@@ -12,17 +12,18 @@ LINK_ENTITY_TO_CLASS( func_asw_fade, CFunc_ASW_Fade );
 
 BEGIN_DATADESC( CFunc_ASW_Fade )
 	DEFINE_FIELD( m_bHasProxies, FIELD_BOOLEAN ),
-	DEFINE_KEYFIELD( m_iCollideWithGrenades, FIELD_CHARACTER, "CollideWithGrenades" ),
-	DEFINE_KEYFIELD( m_bCollideWithMarines, FIELD_BOOLEAN, "CollideWithMarines" ),
 	DEFINE_KEYFIELD( m_nFadeOpacity, FIELD_CHARACTER, "fade_opacity" ),
+	DEFINE_INPUT( m_iCollideWithGrenades, FIELD_CHARACTER, "CollideWithGrenades" ),
+	DEFINE_INPUT( m_bCollideWithMarines, FIELD_BOOLEAN, "CollideWithMarines" ),
 	DEFINE_INPUT( m_bAllowFade, FIELD_BOOLEAN, "AllowFade" ),
 END_DATADESC()
 
 IMPLEMENT_SERVERCLASS_ST( CFunc_ASW_Fade, DT_Func_ASW_Fade )
 	SendPropInt( SENDINFO( m_nFadeOpacity ), 8, SPROP_UNSIGNED ),
+	SendPropInt( SENDINFO( m_iCollideWithGrenades ), 2, SPROP_UNSIGNED ),
+	SendPropBool( SENDINFO( m_bCollideWithMarines ) ),
 	SendPropBool( SENDINFO( m_bAllowFade ) ),
 	SendPropBool( SENDINFO( m_bHasProxies ) ),
-	SendPropBool( SENDINFO( m_bCollideWithMarines ) ),
 END_SEND_TABLE()
 
 CFunc_ASW_Fade::CFunc_ASW_Fade()

src/game/server/swarm/func_asw_fade.h

@@ -28,7 +28,7 @@ class CFunc_ASW_Fade : public CFuncBrush
 	// 0 = only when grenade spawns above the brush
 	// 1 = always
 	// 2 = never
-	byte m_iCollideWithGrenades;
+	CNetworkVar( byte, m_iCollideWithGrenades );
 	CNetworkVar( bool, m_bCollideWithMarines );
 	CNetworkVar( byte, m_nFadeOpacity );
 	CNetworkVar( bool, m_bAllowFade );