zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2025-05-05 21:50:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

Save and restore music position when changing to a map with the same music defined. DONT_BUILD.

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@6123 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
terminx 2017-04-24 04:35:13 +00:00
parent 889a0e7fbc
commit 0acdeb93d1
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
source/duke3d/src/premap.cpp
View file

@ -1908,9 +1908,16 @@ int G_EnterLevel(int gameMode)
if (ud.recstat != 2) if (ud.recstat != 2)
{ {
int32_t const mpos = S_GetMusicPosition();
if (g_mapInfo[mii].musicfn != NULL)
S_PlayMusic(g_mapInfo[mii].musicfn);
if (g_mapInfo[g_musicIndex].musicfn != NULL && g_mapInfo[mii].musicfn != NULL
&& !Bstrcmp(g_mapInfo[g_musicIndex].musicfn, g_mapInfo[mii].musicfn))
S_SetMusicPosition(mpos);
g_musicIndex = mii; g_musicIndex = mii;
if (g_mapInfo[g_musicIndex].musicfn != NULL)
S_PlayMusic(g_mapInfo[g_musicIndex].musicfn);
} }
if (gameMode & (MODE_GAME|MODE_EOL)) if (gameMode & (MODE_GAME|MODE_EOL))