Character::get_wielded_item returns an item_location
#58666
Merged
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
github-actions
bot
added
[C++]
mqrause
force-pushed
the
weapon_location
branch
2 times, most recently
from
1253043 to
c30dce5
Compare
github-actions
bot
added
the
BasicBuildPassed
github-actions
bot
added
BasicBuildPassed
mqrause
force-pushed
the
weapon_location
branch
5 times, most recently
from
d0f6204 to
5459121
Compare
github-actions
bot
added
the
BasicBuildPassed
mqrause
force-pushed
the
weapon_location
branch
3 times, most recently
from
9869260 to
4f6c71c
Compare
mqrause
force-pushed
the
weapon_location
branch
2 times, most recently
from
c7f4a40 to
6357ba6
Compare
github-actions
bot
removed
the
BasicBuildPassed
github-actions
bot
added
the
BasicBuildPassed
Closed
dseguin
pushed a commit
that referenced
this pull request
Jul 16, 2022
* Riotbot attack: Check if wielded weapon is null before using The game would occasionally crash when in presence of a riotbot. Running a debug build of the game relvealed the cause - mattack::riotbot would use get_wielded_item()->typeId() without checking if it was actually getting an item. The function will now check the returned item_location like other code using get_wielded_item() does. References #58666 * Add parentheses to the logical expression
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.
Summary
Infrastructure "Character::get_wielded_item returns an item_location"
Purpose of change
More item_location.
Describe the solution
Change the return type and then adjust all the things while trying to not make it explode in scope.
Describe alternatives you've considered
Testing
It compiles and tests pass. I reviewed all except the test files (tests ran over a dozen times without issues) for potential nullpointer dereferences and hopefully didn't miss any. Played around in the game for like 10 minutes without crashes, but it's near impossible to test everything. But I'm fairly optimistic and any issues should be easily fixable.
Additional context
Beware of conflicts with other PRs.