Moved reloading of main descent2.ham (in case mission brings it's own verision) from LoadLevel() to load_mission() so it does not screw missions with ther custom ham-file (like vertigo)

This commit is contained in:
zicodxx 2011-04-20 19:42:02 +02:00
parent 3705012d32
commit a498f20bc9
3 changed files with 6 additions and 4 deletions

View file

@ -3,6 +3,7 @@ D2X-Rebirth Changelog
20110420
--------
main/multi.c, main/state.c: Resolved termination issue when reading and comparing callsigns fro Coop savestates; Added scores sending after Coop savestate loading as unrestored players will send them when loading new level
main/gameseq.c, main/misison.c: Moved reloading of main descent2.ham (in case mission brings it's own version) from LoadLevel() to load_mission() so it does not screw missions with ther custom ham-file (like vertigo)
20110418
--------

View file

@ -781,10 +781,6 @@ void LoadLevel(int level_num,int page_in_textures)
if (load_ret)
Error("Couldn't load level file <%s>, error = %d",level_name,load_ret);
// re-read default HAM file, in case this mission brings it's own version of it
free_polygon_models();
read_hamfile();
Current_level_num=level_num;
load_palette(Current_level_palette,1,1); //don't change screen

View file

@ -593,6 +593,7 @@ void free_mission_list(mle *mission_list)
}
void init_extra_robot_movie(char *filename);
int read_hamfile();
//values for built-in mission
@ -819,6 +820,10 @@ int load_mission(mle *mission)
return 0;
}
// re-read default HAM file, in case this mission brings it's own version of it
free_polygon_models();
read_hamfile();
if (Current_mission->enhanced) {
char t[50];
extern void bm_read_extra_robots();