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

When emulating D1, put descent.hog at front of search list.

Browse source 
That way we get the D1 music when playing a D1 mission.
This also means we get D1 music in the menu, etc.
Therefore only keeps D1 assets loaded until non-D1 mission is selected.
This commit is contained in:
Bradley Bell 2015-01-30 15:18:22 -08:00 committed by Bradley Bell
parent 28bd4c1650
commit f535bff4f8
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
similar/main/mission.cpp
View file

@ -732,7 +732,7 @@ static int load_mission(const mle *mission)
if (EMULATING_D1)
#endif
{
if (!PHYSFSX_contfile_init("descent.hog", 1))
if (!PHYSFSX_contfile_init("descent.hog", 0))
#if defined(DXX_BUILD_DESCENT_I)
Error("descent.hog not available!\n");
#elif defined(DXX_BUILD_DESCENT_II)
@ -741,6 +741,10 @@ static int load_mission(const mle *mission)
if (!d_stricmp(Current_mission_filename, D1_MISSION_FILENAME))
return load_mission_d1();
}
#if defined(DXX_BUILD_DESCENT_II)
else
PHYSFSX_contfile_close("descent.hog");
#endif
#if defined(DXX_BUILD_DESCENT_II)
if (PLAYING_BUILTIN_MISSION) {