Skip to content

Update asw_marine.cpp make hornets and smartbomb nolonger friendlyfire #1007

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
BenLubar merged 2 commits into from
Nov 19, 2025
Merged

Update asw_marine.cpp make hornets and smartbomb nolonger friendlyfire #1007

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
01ff4dd
Update asw_marine.cpp make hornets and smartbomb nolonger friendlyfire
connman116 Nov 19, 2025
3117211
Update src/game/server/swarm/asw_marine.cpp
connman116 Nov 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion src/game/server/swarm/asw_marine.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1419,7 +1419,12 @@ int CASW_Marine::OnTakeDamage_Alive( const CTakeDamageInfo &info )
Msg( " but all ignored, since it's from a team mate\n" );
return 0;
}
else
//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 )
{
Expand Down