Skip to content

Commit 2d37a24

Browse files
committed
fix formatting of alt names and callsigns when saving a mission
1 parent b970e22 commit 2d37a24

File tree

2 files changed

+24
-4
lines changed

2 files changed

+24
-4
lines changed

fred2/missionsave.cpp

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3624,12 +3624,22 @@ int CFred_mission_save::save_objects()
36243624

36253625
// optional alternate type name
36263626
if (strlen(Fred_alt_names[i])) {
3627-
fout("\n$Alt: %s\n", Fred_alt_names[i]);
3627+
if (optional_string_fred("$Alt:", "$Team:")) {
3628+
parse_comments();
3629+
} else {
3630+
fout("\n$Alt:");
3631+
}
3632+
fout(" %s", Fred_alt_names[i]);
36283633
}
36293634

36303635
// optional callsign
36313636
if (Mission_save_format != FSO_FORMAT_RETAIL && strlen(Fred_callsigns[i])) {
3632-
fout("\n$Callsign: %s\n", Fred_callsigns[i]);
3637+
if (optional_string_fred("$Callsign:", "$Team:")) {
3638+
parse_comments();
3639+
} else {
3640+
fout("\n$Callsign:");
3641+
}
3642+
fout(" %s", Fred_callsigns[i]);
36333643
}
36343644

36353645
required_string_fred("$Team:");

qtfred/src/mission/missionsave.cpp

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3538,12 +3538,22 @@ int CFred_mission_save::save_objects()
35383538

35393539
// optional alternate type name
35403540
if (strlen(Fred_alt_names[i])) {
3541-
fout("\n$Alt: %s\n", Fred_alt_names[i]);
3541+
if (optional_string_fred("$Alt:", "$Team:")) {
3542+
parse_comments();
3543+
} else {
3544+
fout("\n$Alt:");
3545+
}
3546+
fout(" %s", Fred_alt_names[i]);
35423547
}
35433548

35443549
// optional callsign
35453550
if (save_format != MissionFormat::RETAIL && strlen(Fred_callsigns[i])) {
3546-
fout("\n$Callsign: %s\n", Fred_callsigns[i]);
3551+
if (optional_string_fred("$Callsign:", "$Team:")) {
3552+
parse_comments();
3553+
} else {
3554+
fout("\n$Callsign:");
3555+
}
3556+
fout(" %s", Fred_callsigns[i]);
35473557
}
35483558

35493559
required_string_fred("$Team:");

0 commit comments

Comments
 (0)