Commit 482c5a5
committed
fix some waypoint bugs
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.1 parent 5c2e5a2 commit 482c5a5
4 files changed
Lines changed: 25 additions & 29 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
399 | 399 | | |
400 | 400 | | |
401 | 401 | | |
402 | | - | |
| 402 | + | |
403 | 403 | | |
404 | 404 | | |
405 | 405 | | |
| |||
410 | 410 | | |
411 | 411 | | |
412 | 412 | | |
413 | | - | |
414 | | - | |
| 413 | + | |
| 414 | + | |
| 415 | + | |
415 | 416 | | |
416 | 417 | | |
417 | 418 | | |
| |||
420 | 421 | | |
421 | 422 | | |
422 | 423 | | |
423 | | - | |
| 424 | + | |
424 | 425 | | |
425 | 426 | | |
426 | 427 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
480 | 480 | | |
481 | 481 | | |
482 | 482 | | |
483 | | - | |
| 483 | + | |
484 | 484 | | |
485 | 485 | | |
486 | | - | |
487 | 486 | | |
488 | 487 | | |
489 | 488 | | |
490 | 489 | | |
491 | | - | |
492 | | - | |
| 490 | + | |
493 | 491 | | |
494 | | - | |
495 | | - | |
| 492 | + | |
| 493 | + | |
| 494 | + | |
| 495 | + | |
| 496 | + | |
| 497 | + | |
496 | 498 | | |
| 499 | + | |
| 500 | + | |
| 501 | + | |
497 | 502 | | |
498 | 503 | | |
499 | 504 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
3400 | 3400 | | |
3401 | 3401 | | |
3402 | 3402 | | |
3403 | | - | |
| 3403 | + | |
3404 | 3404 | | |
3405 | 3405 | | |
3406 | 3406 | | |
3407 | | - | |
| 3407 | + | |
3408 | 3408 | | |
3409 | | - | |
3410 | 3409 | | |
3411 | 3410 | | |
3412 | 3411 | | |
3413 | 3412 | | |
3414 | | - | |
| 3413 | + | |
3415 | 3414 | | |
3416 | | - | |
3417 | | - | |
3418 | | - | |
3419 | | - | |
| 3415 | + | |
3420 | 3416 | | |
3421 | | - | |
3422 | 3417 | | |
3423 | | - | |
| 3418 | + | |
3424 | 3419 | | |
3425 | 3420 | | |
3426 | 3421 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
2642 | 2642 | | |
2643 | 2643 | | |
2644 | 2644 | | |
2645 | | - | |
| 2645 | + | |
2646 | 2646 | | |
2647 | 2647 | | |
2648 | 2648 | | |
2649 | | - | |
| 2649 | + | |
2650 | 2650 | | |
2651 | | - | |
2652 | 2651 | | |
2653 | 2652 | | |
2654 | 2653 | | |
2655 | 2654 | | |
2656 | | - | |
2657 | | - | |
2658 | | - | |
2659 | | - | |
| 2655 | + | |
2660 | 2656 | | |
2661 | 2657 | | |
2662 | 2658 | | |
2663 | | - | |
| 2659 | + | |
2664 | 2660 | | |
2665 | 2661 | | |
2666 | 2662 | | |
2667 | | - | |
2668 | 2663 | | |
2669 | 2664 | | |
2670 | 2665 | | |
| |||
0 commit comments