Merge pull request #1007 from connman116/reactivedrop_beta

BenLubar · web-flow · commit 35722349c9b6 · 2025-11-18T23:28:17.000-06:00
Update asw_marine.cpp make hornets and smartbomb nolonger friendlyfire
diff --git a/src/game/server/swarm/asw_marine.cpp b/src/game/server/swarm/asw_marine.cpp
@@ -1419,6 +1419,11 @@ int CASW_Marine::OnTakeDamage_Alive( const CTakeDamageInfo &info )
 				Msg( "  but all ignored, since it's from a team mate\n" );
 			return 0;
 		}
+		//make hornet and smart bomb no longer friendlyfire	
+		else if (!ASWDeathmatchMode() && pWeapon && (pWeapon->Classify() == CLASS_ASW_HORNET_BARRAGE || pWeapon->Classify() == CLASS_ASW_SMART_BOMB))
+			{
+    			return 0;
+			}			
 		else
 		{
 			if ( newInfo.GetDamageType() & DMG_CLUB )

Original file line number	Diff line number	Diff line change
`@@ -1419,6 +1419,11 @@ int CASW_Marine::OnTakeDamage_Alive( const CTakeDamageInfo &info )`
`1419`	`1419`	`Msg( " but all ignored, since it's from a team mate\n" );`
`1420`	`1420`	`return 0;`
`1421`	`1421`	`}`
	`1422`	`+ //make hornet and smart bomb no longer friendlyfire`
	`1423`	`+ else if (!ASWDeathmatchMode() && pWeapon && (pWeapon->Classify() == CLASS_ASW_HORNET_BARRAGE \|\| pWeapon->Classify() == CLASS_ASW_SMART_BOMB))`
	`1424`	`+ {`
	`1425`	`+ return 0;`
	`1426`	`+ }`
`1422`	`1427`	`else`
`1423`	`1428`	`{`
`1424`	`1429`	`if ( newInfo.GetDamageType() & DMG_CLUB )`