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

Add more TF2 specific DMG_ definitions #756

Merged
merged 3 commits into from
Jan 26, 2018
Merged

Add more TF2 specific DMG_ definitions #756

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a99e3e2
Add more TF2 DMG_ definitions
Pelipoika Jan 25, 2018
dc5fc00
Guard them all
Pelipoika Jan 25, 2018
511923a
Inline doccomments
Pelipoika Jan 26, 2018
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
18 changes: 18 additions & 0 deletions plugins/include/sdkhooks.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,24 @@
#if !defined DMG_CRIT
Copy link
Member

Choose a reason for hiding this comment

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

You don’t want these inside this #if - you might want an #if for each one though (@psychonic?)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

The DMG_ defines above are defined the same way

Copy link
Member

Choose a reason for hiding this comment

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

I agree with @asherkin

The ones above were done that way because there was a popular include at the time that had all of them in it copied from the SDK like ours were.

For the TF2 ones, it's very possible to run into plugins where users have manually defined one or more of these on their own due to us never having them. It doesn't hurt to guard them.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done

// TF2 crits and minicrits
#define DMG_CRIT DMG_ACID

//No damage falloff
Copy link
Member

@Headline Headline Jan 26, 2018 •
edited
Loading

Choose a reason for hiding this comment

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

This is a nit, but by doing this we eat up lots of whitespace, perhaps we can move the comments inline?

#if !defined DMG_CRIT
	#define DMG_CRIT DMG_ACID /* TF2 crits and minicrits */
#endif

Perhaps even take away the whitespace between each #endif and #if, but I'm not sure if smdevs would like them slammed together that closely.
@asherkin ?

Copy link
Member

Choose a reason for hiding this comment

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

That's actually a good point - they need to be doccomments for the parser to pick them up correctly, and the sanest way to do that is inline using /**< comment here */ (the DMG_CRIT one should change as well).

I don't really care about the line count / whitespace.

#define DMG_RADIUS_MAX DMG_ENERGYBEAM

//Don't do damage falloff too close
#define DMG_NOCLOSEDISTANCEMOD DMG_POISON

//50% damage falloff
#define DMG_HALF_FALLOFF DMG_RADIATION

//Do damage falloff
#define DMG_USEDISTANCEMOD DMG_SLOWBURN

//Ignite victim
#define DMG_IGNITE DMG_PLASMA

//Do hit location damage (Like the sniperrifle and ambassador)
#define DMG_USE_HITLOCATIONS DMG_AIRBOAT
#endif

enum SDKHookType
Expand Down