have the campaign editor pass the links to save properly

Author: MjnMixael

code/missioneditor/campaignsave.cpp

@@ -10,7 +10,7 @@
 
 // Bodies copied from the old implementations in missionsave.cpp,
 // unchanged except for the new class name and include.
-int Fred_campaign_save::save_campaign_file(const char* pathname)
+int Fred_campaign_save::save_campaign_file(const char* pathname, const SCP_vector<campaign_link>& links)
 {
 	// This is original FRED code. These were moved to the call sites as the data should be fully
 	// prepared before calling this function.
@@ -162,55 +162,100 @@ int Fred_campaign_save::save_campaign_file(const char* pathname)
 			bypass_comment(";;FSO 3.6.8;; +Debriefing Persona Index:");
 		}
 
-		// new save cmission sexps
-		if (optional_string_fred("+Formula:", "$Mission:")) {
-			parse_comments();
-		} else {
-			fout("\n+Formula:");
+		// save campaign link sexp
+		bool mission_loop = false;
+		bool mission_fork = false;
+		int flag = 0;
+		for (auto& link : links) {
+			if (link.from == i) {
+				if (!flag) {
+					if (optional_string_fred("+Formula:", "$Mission:"))
+						parse_comments();
+					else
+						fout("\n+Formula:");
+
+					fout(" ( cond\n");
+					flag = 1;
+				}
+
+				// save_campaign_sexp(Links[j].sexp, Campaign.missions[Links[j].to].name);
+				if (link.is_mission_loop) {
+					mission_loop = true;
+				} else if (link.is_mission_fork && (save_config.save_format != MissionFormat::RETAIL)) {
+					mission_fork = true;
+				} else {
+					save_campaign_sexp(link.sexp, link.to);
+				}
+			}
 		}
 
-		{
-			SCP_string sexp_out{};
-			convert_sexp_to_string(sexp_out, cm.formula, SEXP_SAVE_MODE);
-			fout(" %s", sexp_out.c_str());
+		if (flag) {
+			fout(")");
 		}
 
-		bool mission_loop = cm.flags & CMISSION_FLAG_HAS_LOOP;
-
-		Assertion(cm.flags ^ CMISSION_FLAG_HAS_FORK,
-			"scpFork campaigns cannot be saved, use axemFork.\n Should be detected on load.");
-
-		if (mission_loop) {
-			required_string_fred("\n+Mission Loop:");
+		// now save campaign loop sexp
+		if (mission_loop || mission_fork) {
+			if (mission_loop)
+				required_string_fred("\n+Mission Loop:");
+			else
+				required_string_fred("\n+Mission Fork:");
 			parse_comments();
 
-			if (cm.mission_branch_desc) {
-				required_string_fred("+Mission Loop Text:");
-				parse_comments();
-				fout_ext("\n", "%s", cm.mission_branch_desc);
-				fout("\n$end_multi_text");
-			}
-
-			if (cm.mission_branch_brief_anim) {
-				required_string_fred("+Mission Loop Brief Anim:");
-				parse_comments();
-				fout_ext("\n", "%s", cm.mission_branch_brief_anim);
-				fout("\n$end_multi_text");
+			int num_mission_special = 0;
+			for (auto& link : links) {
+				if ((link.from == i) && (link.is_mission_loop || link.is_mission_fork)) {
+
+					num_mission_special++;
+
+					if ((num_mission_special == 1) && link.mission_branch_txt) {
+						if (mission_loop)
+							required_string_fred("+Mission Loop Text:");
+						else
+							required_string_fred("+Mission Fork Text:");
+						parse_comments();
+						fout_ext("\n", "%s", link.mission_branch_txt);
+						fout("\n$end_multi_text");
+					}
+
+					if ((num_mission_special == 1) && link.mission_branch_brief_anim) {
+						if (mission_loop)
+							required_string_fred("+Mission Loop Brief Anim:");
+						else
+							required_string_fred("+Mission Fork Brief Anim:");
+						parse_comments();
+						fout_ext("\n", "%s", link.mission_branch_brief_anim);
+						fout("\n$end_multi_text");
+					}
+
+					if ((num_mission_special == 1) && link.mission_branch_brief_sound) {
+						if (mission_loop)
+							required_string_fred("+Mission Loop Brief Sound:");
+						else
+							required_string_fred("+Mission Fork Brief Sound:");
+						parse_comments();
+						fout_ext("\n", "%s", link.mission_branch_brief_sound);
+						fout("\n$end_multi_text");
+					}
+
+					if (num_mission_special == 1) {
+						// write out mission loop formula
+						fout("\n+Formula:");
+						fout(" ( cond\n");
+						save_campaign_sexp(link.sexp, link.to);
+						fout(")");
+					}
+					if (mission_fork) {
+						fout("Option: ", Campaign.missions[link.to].name);
+					}
+				}
 			}
-
-			if (cm.mission_branch_brief_sound) {
-				required_string_fred("+Mission Loop Brief Sound:");
-				parse_comments();
-				fout_ext("\n", "%s", cm.mission_branch_brief_sound);
-				fout("\n$end_multi_text");
-			}
-
-			// write out mission loop formula
-			fout("\n+Formula:");
-			{
-				SCP_string sexp_out{};
-				convert_sexp_to_string(sexp_out, cm.mission_loop_formula, SEXP_SAVE_MODE);
-				fout(" %s", sexp_out.c_str());
+			if (mission_loop && num_mission_special > 1) {
+				char buffer[1024];
+				sprintf(buffer,
+					"Multiple branching loop error from mission %s\nEdit campaign for *at most* 1 loop from each "
+					"mission.",
+					cm.name);
+				Message(os::dialogs::MESSAGEBOX_ERROR, buffer);
 			}
 		}
 

code/missioneditor/campaignsave.h

@@ -1,6 +1,18 @@
 #pragma once
 #include "missionsave.h"
 
+typedef struct campaign_link {
+	int from;                         // index of source mission
+	int to;                           // index of mission link leads to
+	int sexp;                         // sexp index of condition that allows this branch
+	int node;                         // node tracker when link is in sexp tree window
+	bool is_mission_loop;             // whether link leads to mission loop
+	bool is_mission_fork;             // whether link leads to mission fork
+	char* mission_branch_txt;         // text describing mission loop
+	char* mission_branch_brief_anim;  // filename of anim to play in the brief
+	char* mission_branch_brief_sound; // filename of anim to play in the brief
+} campaign_link;
+
 class Fred_campaign_save : public Fred_mission_save {
   public:
 	/**
@@ -15,7 +27,7 @@ class Fred_campaign_save : public Fred_mission_save {
 	 *
 	 * @see save_mission_internal()
 	 */
-	int save_campaign_file(const char* pathname);
+	int save_campaign_file(const char* pathname, const SCP_vector<campaign_link>& links);
 
   private:
 	/**

fred2/campaigntreewnd.cpp

@@ -206,7 +206,24 @@ void campaign_tree_wnd::OnCpgnFileSave()
 	Campaign_tree_formp->save_tree(); // flush all changes so they get saved.
 	Campaign_tree_viewp->sort_elements();
 
-	if (save.save_campaign_file(full_path))
+	SCP_vector<campaign_link> links;
+	for (int i = 0; i < Total_links; i++) {
+		campaign_link link{
+			Links[i].from,
+			Links[i].to,
+			Links[i].sexp,
+			Links[i].node,
+			Links[i].is_mission_loop,
+			Links[i].is_mission_fork,
+			Links[i].mission_branch_txt,
+			Links[i].mission_branch_brief_anim,
+			Links[i].mission_branch_brief_sound
+		};
+
+		links.emplace_back(link);
+	}
+
+	if (save.save_campaign_file(full_path, links))
 	{
 		MessageBox("An error occured while saving!", "Error", MB_OK | MB_ICONEXCLAMATION);
 		return;
@@ -258,7 +275,22 @@ void campaign_tree_wnd::OnCpgnFileSaveAs()
 		Campaign_tree_formp->save_tree(); // flush all changes so they get saved.
 		Campaign_tree_viewp->sort_elements();
 
-		if (save.save_campaign_file((LPCSTR)dlg.GetPathName()))
+		SCP_vector<campaign_link> links;
+		for (int i = 0; i < Total_links; i++) {
+			campaign_link link{Links[i].from,
+				Links[i].to,
+				Links[i].sexp,
+				Links[i].node,
+				Links[i].is_mission_loop,
+				Links[i].is_mission_fork,
+				Links[i].mission_branch_txt,
+				Links[i].mission_branch_brief_anim,
+				Links[i].mission_branch_brief_sound};
+
+			links.emplace_back(link);
+		}
+
+		if (save.save_campaign_file((LPCSTR)dlg.GetPathName(), links))
 		{
 			MessageBox("An error occured while saving!", "Error", MB_OK | MB_ICONEXCLAMATION);
 			return;

qtfred/src/mission/dialogs/CampaignEditorDialogModel.cpp

@@ -603,7 +603,10 @@ bool CampaignEditorDialogModel::_saveTo(QString file) const {
 	} else {
 		save.set_save_format(MissionFormat::STANDARD);
 	}*/
-	return !save.save_campaign_file(qPrintable(file.replace('/',DIR_SEPARATOR_CHAR)));
+
+	// TODO create the links vector properly after the campaign editor update is merged
+	SCP_vector<campaign_link> links;
+	return !save.save_campaign_file(qPrintable(file.replace('/',DIR_SEPARATOR_CHAR)), links);
 }
 
 bool CampaignEditorDialogModel::deleteLinksTo(const CampaignMissionData &target) {