TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Switch builtin_mission_filename to d_fname

Browse source
This commit is contained in:
Kp 2014-08-16 04:20:48 +00:00
parent c85819ac94
commit 621f947241
1 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
similar/main/mission.cpp
View file

@ -490,7 +490,7 @@ static void add_d1_builtin_mission_to_list(mle *mission)
}
#if defined(DXX_BUILD_DESCENT_II)
static void add_builtin_mission_to_list(mle *mission, char *name)
static void add_builtin_mission_to_list(mle *mission, d_fname &name)
{
int size = PHYSFSX_fsize("descent2.hog");
@ -520,7 +520,7 @@ static void add_builtin_mission_to_list(mle *mission, char *name)
}
mission->path = mission->filename;
strcpy(name, mission->filename);
name.copy_if(mission->filename, FILENAME_LEN);
mission->builtin_hogsize = size;
mission->descent_version = 2;
mission->anarchy_only_flag = 0;
@ -614,9 +614,6 @@ static mle *build_mission_list(int anarchy_mode)
{
mle *mission_list;
int top_place;
#if defined(DXX_BUILD_DESCENT_II)
char builtin_mission_filename[FILENAME_LEN];
#endif
char search_str[PATH_MAX] = MISSION_DIR;
//now search for levels on disk
@ -637,6 +634,7 @@ static mle *build_mission_list(int anarchy_mode)
num_missions = 0;
#if defined(DXX_BUILD_DESCENT_II)
d_fname builtin_mission_filename;
add_builtin_mission_to_list(mission_list + num_missions, builtin_mission_filename); //read built-in first
#endif
add_d1_builtin_mission_to_list(mission_list + num_missions);