Few misc changes #54
Open
Few misc changes #54
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Contributor
CppHorse
commented
Apr 14, 2023
CppHorse
commented
- Fixed fixed-size array syntax error in tf2utils.inc
- Fixed few warnings in cwx.sp
- Moved IsEmpty() check in GetLoadoutItem so if we no longer equip a custom weapon, it equips our loadout's instead.
nosoop
requested changes
Apr 15, 2023
There was a problem hiding this comment.
Thanks for the PR — I'm struggling to recall why OnGetLoadoutItemPost was written the way it was, but if you can split that into its own PR for further evaluation and make the following changes I can take the rest as allowing the plugin to be compiled on SM 1.11.
third_party/vendored/tf2utils.inc
Outdated
There was a problem hiding this comment.
Probably better to do a bringup of the vendored script to version 0.18.0 just so it's in sync with a tagged release with only the features the plugin depends on.
scripting/cwx.sp
Outdated
| @@ -632,6 +633,7 @@ int Native_RemovePlayerLoadoutItem(Handle plugin, int argc) { | |||
| int flags = GetNativeCell(4); | |||
|
|
|||
| UnsetClientCustomLoadoutItem(client, playerClass, itemSlot, flags); | |||
| return true; | |||
There was a problem hiding this comment.
CWX_RemovePlayerLoadoutItem returns void, so if anything this should return 0.
| int storedItem = g_CurrentLoadout[client][playerClass][loadoutSlot].entity; | ||
| if (!IsValidEntity(storedItem) || GetEntityFlags(storedItem) & FL_KILLME | ||
| || !HasEntProp(storedItem, Prop_Send, "m_Item")) { | ||
| // the loadout entity we keep track of isn't valid, so we may need to make one |
There was a problem hiding this comment.
I feel like there's a reason this wasn't hoisted. Can't think of it at the moment.
CppHorse
force-pushed
the
master
branch
3 times, most recently
from
4396d59 to
9f73dd5
Compare
- Fixed fixed-size array syntax error in tf2utils.inc - Fixed few warnings in cwx.sp - Moved IsEmpty() check in GetLoadoutItem so if we no longer equip a custom weapon, it equips our loadout's instead.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.