Actually grab the object's type when doing type checks. #4505
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
PR scp-fs2open#4500 added some checks, but accidentally compared `aip->target_objnum` to an object type (although the assertion message correctly retrieved the object type, leading to the bizarre assertion that `OBJ_SHIP`, i.e. 1, was an invalid target object type). This commit makes them all access the `Objects[]` array and retrieve the `.type`, just as the assertion message does (and the pre-scp-fs2open#4500 conditional did). Related to scp-fs2open#4504, in that it's the source of the failed assertions, although I can't be sure it was the cause of the crashes without testing.
Baezon
approved these changes
Jul 20, 2022
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.
PR #4500 added some checks, but accidentally compared
aip->target_objnumto an object type (although the assertion message correctly retrieved the object type, leading to the bizarre assertion thatOBJ_SHIP, i.e. 1, was an invalid target object type). This commit makes them all access theObjects[]array and retrieve the.type, just as the assertion message does (and the pre-#4500 conditional did).Related to #4504, in that it's the source of the failed assertions, although I can't be sure it was the cause of the crashes without testing.