Skip to content

fix some waypoint bugs#7255

Merged
Goober5000 merged 1 commit intoscp-fs2open:masterfrom
Goober5000:7104_followup
Feb 28, 2026
Merged

fix some waypoint bugs#7255
Goober5000 merged 1 commit intoscp-fs2open:masterfrom
Goober5000:7104_followup

Conversation

@Goober5000
Copy link
Contributor

  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 #7104. Fixes #7254.

@Goober5000 Goober5000 added fix A fix for bugs, not-a-bugs, and/or regressions. qtfred A feature or issue related to qtFred. fred A feature or issue related to the FReespace EDitor (FRED) labels Feb 28, 2026
@github-project-automation github-project-automation bot moved this to Work In Progress (PRs) in qtFRED2 Feb 28, 2026
@github-project-automation github-project-automation bot moved this from Work In Progress (PRs) to In Review (PRs) in qtFRED2 Feb 28, 2026
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.
@MoerasGrizzly
Copy link

MoerasGrizzly commented Feb 28, 2026

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'?

@Goober5000
Copy link
Contributor Author

Goober5000 commented Feb 28, 2026

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.

@Goober5000 Goober5000 merged commit 135d84e into scp-fs2open:master Feb 28, 2026
20 checks passed
@Goober5000 Goober5000 deleted the 7104_followup branch February 28, 2026 22:31
@github-project-automation github-project-automation bot moved this from In Review (PRs) to Done in qtFRED2 Feb 28, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

fix A fix for bugs, not-a-bugs, and/or regressions. fred A feature or issue related to the FReespace EDitor (FRED) qtfred A feature or issue related to qtFred.

Projects

Status: Done

Development

Successfully merging this pull request may close these issues.

nightlies: Waypoint paths throw errors

3 participants