zdoom/gzdoom-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom-gles.git synced 2024-12-01 08:31:14 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Fixed: MUSINFO must be parsed after MAPINFO, since it needs the entries created by MAPINFO.

Browse source 
SVN r3858 (trunk)
This commit is contained in:
Randy Heit 2012-08-30 03:00:37 +00:00
parent 11a0298f33
commit 59638acb7c
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/d_main.cpp
View file

@ -2218,6 +2218,9 @@ void D_DoomMain (void)
G_ParseMapInfo (iwad_info->MapInfo); G_ParseMapInfo (iwad_info->MapInfo);
ReadStatistics(); ReadStatistics();
// MUSINFO must be parsed after MAPINFO
S_ParseMusInfo();
Printf ("Texman.Init: Init texture manager.\n"); Printf ("Texman.Init: Init texture manager.\n");
TexMan.Init(); TexMan.Init();
C_InitConback(); C_InitConback();

1
src/s_sound.cpp
View file

@ -326,7 +326,6 @@ void S_InitData ()
LastLocalSndInfo = LastLocalSndSeq = ""; LastLocalSndInfo = LastLocalSndSeq = "";
S_ParseSndInfo (false); S_ParseSndInfo (false);
S_ParseSndSeq (-1); S_ParseSndSeq (-1);
S_ParseMusInfo();
} }
//========================================================================== //==========================================================================