fix rebase bug

MjnMixael · MjnMixael · commit 92625462cdfd · 2026-02-15T09:32:25.000-06:00
diff --git a/code/missioneditor/missionsave.cpp b/code/missioneditor/missionsave.cpp
@@ -5122,9 +5122,9 @@ int Fred_mission_save::save_wings()
 	return err;
 }
 
-int CFred_mission_save::save_props()
+int Fred_mission_save::save_props()
 {
-	if (Mission_save_format != FSO_FORMAT_RETAIL) {
+	if (save_config.save_format != MissionFormat::RETAIL) {
 		fred_parse_flag = 0;
 		required_string_fred("#Props");
 		parse_comments(2);
@@ -5165,6 +5165,5 @@ int CFred_mission_save::save_props()
 	}
 
 	fso_comment_pop(true);
-	//Assert(count == Num_props);
 	return err;
 }

Original file line number	Diff line number	Diff line change
`@@ -5122,9 +5122,9 @@ int Fred_mission_save::save_wings()`
`5122`	`5122`	`return err;`
`5123`	`5123`	`}`
`5124`	`5124`
`5125`		`-int CFred_mission_save::save_props()`
	`5125`	`+int Fred_mission_save::save_props()`
`5126`	`5126`	`{`
`5127`		`- if (Mission_save_format != FSO_FORMAT_RETAIL) {`
	`5127`	`+ if (save_config.save_format != MissionFormat::RETAIL) {`
`5128`	`5128`	`fred_parse_flag = 0;`
`5129`	`5129`	`required_string_fred("#Props");`
`5130`	`5130`	`parse_comments(2);`
`@@ -5165,6 +5165,5 @@ int CFred_mission_save::save_props()`
`5165`	`5165`	`}`
`5166`	`5166`
`5167`	`5167`	`fso_comment_pop(true);`
`5168`		`- //Assert(count == Num_props);`
`5169`	`5168`	`return err;`
`5170`	`5169`	`}`