Merged
Conversation
wookieejedi
approved these changes
Feb 28, 2026
94eab5f to
055b29e
Compare
1. The `waypoint_stuff_name` function used the wrong length when building the waypoint name, causing the number to be written past the end of the string in most cases. Not sure how this escaped testing. 2. Change two Assertions, which had no effect due to the comma operator, to Errors, which match their counterparts in their respective functions. 3. Make `internal_error` consistent between the campaign editor, the mission editor, and qtFRED, and prune an unnecessary string copy. Follow-up to scp-fs2open#7104. Fixes scp-fs2open#7254.
055b29e to
482c5a5
Compare
|
I'm also a bit surprised that this one escaped testing. The bug-as-reported shows up with every single FS2 campaign mission I've opened thus far, and every other random mission I have opened too - presumably, just all the ones that have waypoints. Might be worth checking if something went wrong between your own tests and pressing 'commit'? |
Contributor
Author
|
Well, as near as I can reconstruct what happened, I tested it with every waypoint first, then with waypoints whose names were too long. I must have modified the code to fix the too-long case, then tested that, then opened the PR. But the fix for the too-long case had a simple oversight that broke the standard case. |
This file contains hidden or 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
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.
waypoint_stuff_namefunction used the wrong length when building the waypoint name, causing the number to be written past the end of the string in most cases. Not sure how this escaped testing.internal_errorconsistent between the campaign editor, the mission editor, and qtFRED, and prune an unnecessary string copy.Follow-up to #7104. Fixes #7254.