Bugfix: Missiles calculating damage in Process functions instead of Add functions #6327
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
kphoenix137
changed the title
glebm
reviewed
Jul 10, 2023
kphoenix137
force-pushed
the
fix-missiles-bugprone
branch
from
14d8a52
to
75f24c2
Compare
glebm
reviewed
Jul 10, 2023
| @@ -1396,7 +1396,7 @@ void AddSpectralArrow(Missile &missile, AddMissileParameter ¶meter) | |||
| int av = 0; | |||
|
|
|||
| if (missile.sourceType() == MissileSource::Player) { | |||
| const Player &player = *missile.sourcePlayer(); | |||
| Player &player = *missile.sourcePlayer(); | |||
There was a problem hiding this comment.
Why remove the const? I don't think player is modified her?
There was a problem hiding this comment.
Can't iterate through equipment if it's const
There was a problem hiding this comment.
Would it be better to use a traditional for loop to retain player as const?
There was a problem hiding this comment.
Ah, right, this will be easy to fix once we have C++17 but for now non-const is fine.
There was a problem hiding this comment.
I'll add a comment by it so we know to readd const at a later time
kphoenix137
commented
Jul 10, 2023
| @@ -1956,10 +2033,19 @@ void AddMissileExplosion(Missile &missile, AddMissileParameter ¶meter) | |||
| void AddWeaponExplosion(Missile &missile, AddMissileParameter ¶meter) | |||
| { | |||
| missile.var2 = parameter.dst.x; | |||
| if (parameter.dst.x == 1) | |||
|
|
|||
| const Player &player = *missile.sourcePlayer(); | |||
There was a problem hiding this comment.
Need to verify that missile source is player first before defining player
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.
Moves damage calculations from the Process functions into the Add functions, so that damage is added to the missile struct rather than calculated every time the Process functions are called, which can also lead to undefined behavior if the source of the missile dies or leaves the game.
Also fixes: #4656