allow unlimited campaign description length to be saved

Author: MjnMixael

code/mission/missioncampaign.cpp

@@ -504,7 +504,7 @@ int mission_campaign_load(const char* filename, const char* full_path, player* p
 			Error(LOCATION, "Unknown campaign type %s!", type);
 
 		if (optional_string("+Description:"))
-			Campaign.desc = stuff_and_malloc_string(F_MULTITEXT, NULL);
+			stuff_string(Campaign.description, F_MULTITEXT);
 
 		// if the type is multiplayer -- get the number of players
 		if ( Campaign.type != CAMPAIGN_TYPE_SINGLE) {
@@ -1204,10 +1204,7 @@ void mission_campaign_clear()
 {
 	int i;
 
-	if (Campaign.desc != NULL) {
-		vm_free(Campaign.desc);
-		Campaign.desc = NULL;
-	}
+	Campaign.description.clear();
 
 	// be sure to remove all old malloced strings of Mission_names
 	// we must also free any goal stuff that was from a previous campaign

code/mission/missioncampaign.h

@@ -116,7 +116,7 @@ class campaign
 public:
 	char	name[NAME_LENGTH];						// name of the campaign
 	char	filename[CF_MAX_PATHNAME_LENGTH];			// filename the campaign info is in
-	char	*desc;									// description of campaign
+	SCP_string description;                         // unlimited length description of campaign
 	int		type;									// type of campaign
 	int		flags;									// flags - Goober5000
 	int		num_missions;							// number of missions in the campaign
@@ -139,7 +139,7 @@ class campaign
 	SCP_map<SCP_string, SCP_string> custom_data;        // Custom data for the campaign
 
 	campaign()
-		: desc(nullptr), num_missions(0)
+		: num_missions(0)
 	{
 		name[0] = 0;
 		filename[0] = 0;

code/missioneditor/campaignsave.cpp

@@ -31,18 +31,18 @@ int Fred_campaign_save::save_campaign_file(const char* pathname)
 
 	required_string_fred("$Name:");
 	parse_comments(0);
-	fout(" %s", Campaign.name);
+	fout_ext(" ", "%s", Campaign.name);
 
 	Assert((Campaign.type >= 0) && (Campaign.type < MAX_CAMPAIGN_TYPES));
 	required_string_fred("$Type:");
 	parse_comments();
 	fout(" %s", campaign_types[Campaign.type]);
 
 	// XSTR
-	if (Campaign.desc) {
+	if (!Campaign.description.empty()) {
 		required_string_fred("+Description:");
 		parse_comments();
-		fout_ext("\n", "%s", Campaign.desc);
+		fout_ext("\n", "%s", Campaign.description.c_str());
 		fout("\n$end_multi_text");
 	}
 

fred2/campaigneditordlg.cpp

@@ -73,7 +73,7 @@ void campaign_editor::DoDataExchange(CDataExchange* pDX)
 	DDX_CBIndex(pDX, IDC_CAMPAIGN_TYPE, m_type);
 	DDX_Text(pDX, IDC_NUM_PLAYERS, m_num_players);
 	DDX_Text(pDX, IDC_DESC2, m_desc);
-	DDV_MaxChars(pDX, m_desc, MISSION_DESC_LENGTH - 1);
+	//DDV_MaxChars(pDX, m_desc, MISSION_DESC_LENGTH - 1);
 	DDX_Text(pDX, IDC_MISSION_LOOP_DESC, m_branch_desc);
 	DDV_MaxChars(pDX, m_branch_desc, MISSION_DESC_LENGTH - 1);
 	DDX_Text(pDX, IDC_LOOP_BRIEF_ANIM, m_branch_brief_anim);
@@ -251,8 +251,8 @@ void campaign_editor::initialize( bool init_files, bool clear_path )
 	m_type = Campaign.type;
 	m_num_players.Format("%d", Campaign.num_players);
 
-	if (Campaign.desc) {
-		convert_multiline_string(m_desc, Campaign.desc);
+	if (!Campaign.description.empty()) {
+		convert_multiline_string(m_desc, Campaign.description);
 	} else {
 		m_desc = _T("");
 	}
@@ -303,8 +303,6 @@ void campaign_editor::mission_selected(int num)
 
 void campaign_editor::update()
 {
-	char buf[MISSION_DESC_LENGTH];
-
 	// get data from dlog box
 	UpdateData(TRUE);
 
@@ -317,15 +315,11 @@ void campaign_editor::update()
 	Campaign.type = m_type;
 
 	// update campaign desc
-	deconvert_multiline_string(buf, m_desc, MISSION_DESC_LENGTH - 1);
-	if (Campaign.desc) {
-		free(Campaign.desc);
-	}
+	SCP_string desc_buf;
+	deconvert_multiline_string(desc_buf, m_desc);
 
-	Campaign.desc = NULL;
-	if (strlen(buf)) {
-		Campaign.desc = strdup(buf);
-	}
+	Campaign.description.clear();
+	Campaign.description = desc_buf;
 
 	// update flags
 	Campaign.flags = CF_DEFAULT_VALUE;

fred2/campaigntreewnd.cpp

@@ -279,7 +279,6 @@ void campaign_tree_wnd::OnCpgnFileNew()
 	Campaign.num_missions = 0;
 	Campaign.num_players = 0;
 	strcpy_s(Campaign.name, "Unnamed");
-	Campaign.desc = NULL;
 	Campaign_tree_viewp->free_links();
 	Campaign_tree_formp->initialize(true, true);
 	Campaign_modified = 0;

qtfred/src/mission/dialogs/CampaignEditorDialogModel.cpp

@@ -100,7 +100,7 @@ CampaignEditorDialogModel::CampaignEditorDialogModel(CampaignEditorDialog* _pare
 	initialWeapons(Weapon_info, &initWeps, this),
 	missionData(getMissions(), &CampaignMissionData::initMissions, this),
 	campaignName(Campaign.name),		//missioncampaign.h globals
-	campaignDescr(Campaign.desc),
+	campaignDescr(Campaign.description.c_str()),
 	campaignTechReset(Campaign.flags & CF_CUSTOM_TECH_DATABASE)
 {
 	Assertion(_numPlayers == 0 || campaignFile.isEmpty(), "The editor should only allow setting a player number when a new campaign is created. Please report.");
@@ -447,7 +447,7 @@ bool CampaignEditorDialogModel::_saveTo(QString file) const {
 	Campaign.type = campaignTypes.indexOf(campaignType);
 
 	if (!modified_desc.isEmpty())
-		Campaign.desc = vm_strdup(qPrintable(modified_desc));
+		Campaign.description = modified_desc.toUtf8().constData();
 
 	Campaign.num_players = numPlayers;