Skip to content

fix: prevent missile (hornets and smart bomb) friendly fire #1097

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

Open
anf3is wants to merge 1 commit into
base: reactivedrop_beta
Choose a base branch
from
Open

fix: prevent missile (hornets and smart bomb) friendly fire #1097

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 8 additions & 5 deletions src/game/server/swarm/asw_marine.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1421,11 +1421,14 @@ 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 ( !ASWDeathmatchMode() && info.GetInflictor() &&
info.GetInflictor()->Classify() == CLASS_MISSILE )
{
// prevent hornets and smart bomb friendly fire
if ( asw_debug_marine_damage.GetBool() )
Msg( " but all ignored, since it's from a missile\n" );
return 0;
}
else
{
if ( newInfo.GetDamageType() & DMG_CLUB )
Expand Down
Loading