Use std::string for mission path

common/main/mission.h

@@ -27,6 +27,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #define _MISSION_H
 
 #include <memory>
+#include <string>
 #include "pstypes.h"
 #include "inferno.h"
 
@@ -75,11 +76,11 @@ static const ubyte MAX_SECRET_LEVELS_PER_MISSION = 127;	// KREATOR - increased f
 #define MISSION_DIR "missions/"
 
 struct Mission {
-	char    *filename;          // filename
+	std::string::const_iterator filename;          // filename
 	int     builtin_hogsize;    // the size of the hogfile for a builtin mission, and 0 for an add-on mission
 	char	mission_name[MISSION_NAME_LEN+1];
 	ubyte   anarchy_only_flag;  // if true, mission is only for anarchy
-	char	*path;				// relative file path
+	std::string path;				// relative file path
 	d_fname	briefing_text_filename; // name of briefing file
 	d_fname	ending_text_filename; // name of ending file
 	std::unique_ptr<ubyte[]>	secret_level_table; // originating level no for each secret level 
@@ -101,7 +102,7 @@ typedef std::unique_ptr<Mission> Mission_ptr;
 extern Mission_ptr Current_mission; // current mission
 
 #define Current_mission_longname	Current_mission->mission_name
-#define Current_mission_filename	Current_mission->filename
+#define Current_mission_filename	&*Current_mission->filename
 #define Briefing_text_filename		Current_mission->briefing_text_filename
 #define Ending_text_filename		Current_mission->ending_text_filename
 #define Last_level			Current_mission->last_level

d2x-rebirth/main/movie.cpp

@@ -724,7 +724,7 @@ static void close_extra_robot_movie(void)
 	}
 }
 
-void init_extra_robot_movie(char *movielib)
+void init_extra_robot_movie(const char *movielib)
 {
 	if (GameArg.SysNoMovies)
 		return;

d2x-rebirth/main/movie.h

@@ -52,7 +52,7 @@ extern void DeInitRobotMovie(void);
 // find and initialize the movie libraries
 void init_movies();
 
-void init_extra_robot_movie(char *filename);
+void init_extra_robot_movie(const char *filename);
 
 extern int MovieHires;      // specifies whether movies use low or high res
 

similar/main/gameseq.cpp

@@ -1454,7 +1454,7 @@ static void DoEndGame(void)
 		do_end_briefing_screens (Ending_text_filename);
 
 		//try doing special credits
-		sprintf(tname,"%s.ctb",Current_mission_filename);
+		snprintf(tname, sizeof(tname), "%s.ctb", Current_mission_filename);
 		credits_show(tname);
 	}
 

similar/main/mission.cpp

@@ -65,14 +65,14 @@ enum mle_loc
 //mission list entry
 struct mle
 {
-	char    *filename;          // filename without extension
+	std::string::const_iterator filename;          // filename without extension
 	int     builtin_hogsize;    // if it's the built-in mission, used for determining the version
 	char    mission_name[MISSION_NAME_LEN+1];
 #if defined(DXX_BUILD_DESCENT_II)
 	ubyte   descent_version;    // descent 1 or descent 2?
 #endif
 	ubyte   anarchy_only_flag;  // if true, mission is anarchy only
-	char	*path;				// relative file path
+	std::string path;				// relative file path
 	enum mle_loc	location;           // where the mission is
 };
 
@@ -374,9 +374,9 @@ static int read_mission_file(mission_list &mission_list, const char *filename, e
 #endif
 		*ext = 0;			//kill extension
 
-		mission->path = d_strdup(temp);
+		mission->path = temp;
 		mission->anarchy_only_flag = 0;
-		mission->filename = mission->path + (p - temp);
+		mission->filename = next(begin(mission->path), p - temp);
 		mission->location = location;
 
 		p = get_parm_value("name",mfile);
@@ -411,7 +411,6 @@ static int read_mission_file(mission_list &mission_list, const char *filename, e
 		}
 		else {
 			PHYSFS_close(mfile);
-			d_free(mission->path);
 			mission_list.pop_back();
 			return 0;
 		}
@@ -449,13 +448,13 @@ static void add_d1_builtin_mission_to_list(mission_list &mission_list)
 	case D1_SHAREWARE_MISSION_HOGSIZE:
 	case D1_SHAREWARE_10_MISSION_HOGSIZE:
 	case D1_MAC_SHARE_MISSION_HOGSIZE:
-		mission->path = d_strdup(D1_MISSION_FILENAME);
+		mission->path = D1_MISSION_FILENAME;
 		strcpy(mission->mission_name, D1_SHAREWARE_MISSION_NAME);
 		mission->anarchy_only_flag = 0;
 		break;
 	case D1_OEM_MISSION_HOGSIZE:
 	case D1_OEM_10_MISSION_HOGSIZE:
-		mission->path = d_strdup(D1_MISSION_FILENAME);
+		mission->path = D1_MISSION_FILENAME;
 		strcpy(mission->mission_name, D1_OEM_MISSION_NAME);
 		mission->anarchy_only_flag = 0;
 		break;
@@ -467,7 +466,7 @@ static void add_d1_builtin_mission_to_list(mission_list &mission_list)
 	case D1_MISSION_HOGSIZE2:
 	case D1_10_MISSION_HOGSIZE:
 	case D1_MAC_MISSION_HOGSIZE:
-		mission->path = d_strdup(D1_MISSION_FILENAME);
+		mission->path = D1_MISSION_FILENAME;
 		strcpy(mission->mission_name, D1_MISSION_NAME);
 		mission->anarchy_only_flag = 0;
 		break;
@@ -480,7 +479,7 @@ static void add_d1_builtin_mission_to_list(mission_list &mission_list)
 	mission->descent_version = 1;
 	mission->builtin_hogsize = 0;
 #endif
-	mission->filename = mission->path;
+	mission->filename = begin(mission->path);
 }
 
 #if defined(DXX_BUILD_DESCENT_II)
@@ -489,8 +488,8 @@ static void set_hardcoded_mission(mission_list &mission_list, const char (&path)
 {
 	mission_list.emplace_back();
 	mle *mission = &mission_list.back();
-	mission->path = d_strdup(path);
-	mission->filename = mission->path;
+	mission->path = path;
+	mission->filename = begin(mission->path);
 	strcpy(mission->mission_name,mission_name);
 	mission->anarchy_only_flag = 0;
 }
@@ -521,7 +520,7 @@ static void add_builtin_mission_to_list(mission_list &mission_list, d_fname &nam
 	}
 
 	mle *mission = &mission_list.back();
-	name.copy_if(mission->filename, FILENAME_LEN);
+	name.copy_if(mission->path.c_str(), FILENAME_LEN);
     mission->builtin_hogsize = size;
 	mission->descent_version = 2;
 	mission->anarchy_only_flag = 0;
@@ -577,7 +576,7 @@ static void promote (mission_list &mission_list, const char * mission_name, std:
 	if ((t = strchr(name,'.')) != NULL)
 		*t = 0; //kill extension
 	range_for (auto &i, partial_range(mission_list, top_place, mission_list.size()))
-		if (!d_stricmp(i.filename, name)) {
+		if (!d_stricmp(&*i.filename, name)) {
 			//swap mission positions
 			std::swap(mission_list[top_place++], i);
 			break;
@@ -587,16 +586,13 @@ static void promote (mission_list &mission_list, const char * mission_name, std:
 Mission::~Mission()
 {
     // May become more complex with the editor
-	if (path && builtin_hogsize == 0)
+	if (!path.empty() && builtin_hogsize == 0)
 		{
 			char hogpath[PATH_MAX];
 
-			snprintf(hogpath, sizeof(hogpath), MISSION_DIR "%s.hog", path);
+			snprintf(hogpath, sizeof(hogpath), MISSION_DIR "%s.hog", path.c_str());
 			PHYSFSX_contfile_close(hogpath);
 		}
-
-	if (path)
-		d_free(path);
 }
 
 
@@ -647,12 +643,6 @@ static mission_list build_mission_list(int anarchy_mode)
 	return mission_list;
 }
 
-static void free_mission_list(mission_list &mission_list)
-{
-	range_for (auto &i, mission_list)
-		d_free(i.path);
-}
-
 #if defined(DXX_BUILD_DESCENT_II)
 //values for built-in mission
 
@@ -686,7 +676,7 @@ int load_mission_ham()
 		return 1;
 	} else if (Current_mission->enhanced) {
 		char t[50];
-		snprintf(t,sizeof(t),"%s.ham",Current_mission_filename);
+		snprintf(t,sizeof(t), "%s.ham", Current_mission_filename);
 		bm_read_extra_robots(t, Current_mission->enhanced);
 		return 1;
 	} else
@@ -718,7 +708,7 @@ static void record_briefing(d_fname &f, char (&buf)[PATH_MAX])
 //loads the specfied mission from the mission list.
 //build_mission_list() must have been called.
 //Returns true if mission loaded ok, else false.
-static int load_mission(mle *mission)
+static int load_mission(const mle *mission)
 {
 	PHYSFS_file *mfile;
 	char buf[PATH_MAX], *v;
@@ -730,8 +720,8 @@ static int load_mission(mle *mission)
 	Current_mission->descent_version = mission->descent_version;
 #endif
 	Current_mission->anarchy_only_flag = mission->anarchy_only_flag;
-	Current_mission->path = d_strdup(mission->path);
-	Current_mission->filename = Current_mission->path + (mission->filename - mission->path);
+	Current_mission->path = mission->path;
+	Current_mission->filename = next(begin(Current_mission->path), distance(begin(mission->path), mission->filename));
 	Current_mission->n_secret_levels = 0;
 #if defined(DXX_BUILD_DESCENT_II)
 	Current_mission->enhanced = 0;
@@ -788,23 +778,12 @@ static int load_mission(mle *mission)
 
 	//read mission from file
 
-	switch (mission->location) {
-	case ML_MISSIONDIR:
-		strcpy(buf,MISSION_DIR);
-		break;
-	default:
-		Int3();							//fall through
-	case ML_CURDIR:
-		strcpy(buf,"");
-		break;
-	}
-	strcat(buf, mission->path);
+	auto &msn_extension =
 #if defined(DXX_BUILD_DESCENT_II)
-	if (mission->descent_version == 2)
-		strcat(buf,".mn2");
-	else
+	(mission->descent_version == 2) ? ".mn2" :
 #endif
-		strcat(buf,".msn");
+		".msn";
+	snprintf(buf, sizeof(buf), "%s%s%s", mission->location == ML_MISSIONDIR ? MISSION_DIR : "", mission->path.c_str(), msn_extension);
 
 	PHYSFSEXT_locateCorrectCase(buf);
 
@@ -934,19 +913,19 @@ static int load_mission(mle *mission)
 				if ((v=get_value(buf))!=NULL) {
 					unsigned l = strlen(v);
 					if (l <= 4)
-						con_printf(CON_URGENT, "Mission %s has short HAM \"%s\".", Current_mission->path, v);
+						con_printf(CON_URGENT, "Mission %s has short HAM \"%s\".", Current_mission->path.c_str(), v);
 					else if (l >= sizeof(*Current_mission->alternate_ham_file))
-						con_printf(CON_URGENT, "Mission %s has excessive HAM \"%s\".", Current_mission->path, v);
+						con_printf(CON_URGENT, "Mission %s has excessive HAM \"%s\".", Current_mission->path.c_str(), v);
 					else {
 						Current_mission->alternate_ham_file->copy_if(v, l + 1);
-						con_printf(CON_VERBOSE, "Mission %s will use HAM %s.", Current_mission->path, static_cast<const char *>(*Current_mission->alternate_ham_file));
+						con_printf(CON_VERBOSE, "Mission %s will use HAM %s.", Current_mission->path.c_str(), static_cast<const char *>(*Current_mission->alternate_ham_file));
 					}
 				}
 				else
-					con_printf(CON_URGENT, "Mission %s has no HAM.", Current_mission->path);
+					con_printf(CON_URGENT, "Mission %s has no HAM.", Current_mission->path.c_str());
 			}
 			else {
-				con_printf(CON_URGENT, "Mission %s uses unsupported critical directive \"%s\".", Current_mission->path, buf);
+				con_printf(CON_URGENT, "Mission %s uses unsupported critical directive \"%s\".", Current_mission->path.c_str(), buf);
 				Last_level = 0;
 				break;
 			}
@@ -981,13 +960,11 @@ int load_mission_by_name(const char *mission_name)
 	bool found = 0;
 
 	range_for (auto &i, mission_list)
-		if (!d_stricmp(mission_name, i.filename))
+		if (!d_stricmp(mission_name, &*i.filename))
 		{
 			found = load_mission(&i);
 			break;
 		}
-
-	free_mission_list(mission_list);
 	return found;
 }
 
@@ -1020,7 +997,6 @@ static int mission_menu_handler(listbox *lb, d_event *event, mission_menu *mm)
 			break;
 
 		case EVENT_WINDOW_CLOSE:
-			free_mission_list(mm->ml);
 			d_free(list);
 			delete mm;
 			break;
@@ -1040,7 +1016,6 @@ int select_mission(int anarchy_mode, const char *message, int (*when_selected)(v
     if (mission_list.size() <= 1)
 	{
         new_mission_num = !mission_list.empty() && load_mission(&mission_list.front()) ? 0 : -1;
-		free_mission_list(mission_list);
 		(*when_selected)();
 
 		return (new_mission_num >= 0);
@@ -1053,7 +1028,6 @@ int select_mission(int anarchy_mode, const char *message, int (*when_selected)(v
 		MALLOC(m, const char *, mission_list.size());
 		if (!m)
 		{
-			free_mission_list(mission_list);
 			return 0;
 		}
 
@@ -1079,14 +1053,8 @@ int select_mission(int anarchy_mode, const char *message, int (*when_selected)(v
 void create_new_mission(void)
 {
 	Current_mission.reset(new Mission{});
-	Current_mission->path = d_strdup("new_mission");
-	if (!Current_mission->path)
-	{
-		Current_mission.reset();
-		return;
-	}
-
-	Current_mission->filename = Current_mission->path;
+	Current_mission->path = "new_mission";
+	Current_mission->filename = begin(Current_mission->path);
 
 	Level_names.reset(new d_fname[1]);
 	if (!Level_names)

similar/main/playsave.cpp

@@ -1110,13 +1110,11 @@ int get_highest_level(void)
 	int i;
 	int highest_saturn_level = 0;
 	read_player_file();
-#ifndef SATURN
-	if (strlen(Current_mission_filename)==0 )	{
+	if (*Current_mission->filename == 0)	{
 		for (i=0;i < PlayerCfg.NHighestLevels;i++)
 			if (!d_stricmp(PlayerCfg.HighestLevels[i].Shortname, "DESTSAT")) // Destination Saturn.
 				highest_saturn_level = PlayerCfg.HighestLevels[i].LevelNum;
 	}
-#endif
 	i = PlayerCfg.HighestLevels[find_hli_entry()].LevelNum;
 	if ( highest_saturn_level > i )
 		i = highest_saturn_level;