Skip to content
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

Jump to bottom

Afterburn from Flamer should be considered Friendly Fire as well #834

Open
wants to merge 2 commits into
base: reactivedrop_beta
Choose a base branch
from
Open

Afterburn from Flamer should be considered Friendly Fire as well #834

wants to merge 2 commits into from
+5 −4

Conversation

ModdedMarionette
Copy link
Contributor

  • Afterburn from Flamer should be considered Friendly Fire as well
  • Added checks to prevent potential access to null instances

ModdedMarionette
ModdedMarionette commented Nov 7, 2024
View reviewed changes
src/game/server/swarm/asw_marine.cpp
@@ -5065,7 +5066,7 @@ void CASW_Marine::ASW_Ignite( float flFlameLifetime, float flSize, CBaseEntity *
bool bFriendlyFire = IRelationType( pAttacker ) == D_LI;

// Mari: special scaling for flamer ff
if (asw_marine_ff_absorption.GetInt() > 0 && bFriendlyFire && pDamagingWeapon->Classify() == CLASS_ASW_FLAMER)
if ( asw_marine_ff_absorption.GetInt() > 0 && bFriendlyFire && pDamagingWeapon && pDamagingWeapon->Classify() == CLASS_ASW_FLAMER )
Copy link
Contributor Author

@ModdedMarionette ModdedMarionette Nov 7, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There was a "conflict" for not having spaces at the start and end of the parathesis.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@ModdedMarionette