OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- Changed music name handling in MAPINFO so that music can be specified by

Browse source 
full path of a file in a Zip.
- Fixed: intermusic in MAPINFO was limited to WAD lumps and couldn't handle 
  external data.

ACS:

- Fixed: Global and World array symbols didn't initialize their array information.


SVN r182 (trunk)
This commit is contained in:
Christoph Oelckers 2006-06-09 08:19:46 +00:00
commit 9655ee9843
6 changed files with 19 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/wi_stuff.cpp
View file

@ -1917,13 +1917,13 @@ void WI_Ticker(void)
if (bcnt == 1)
{
// intermission music - use the defaults if none specified
if (level.info->intermusic[0])
S_ChangeMusic(level.info->intermusic);
if (level.info->intermusic != NULL)
S_ChangeMusic(level.info->intermusic, level.info->intermusicorder);
else if (gameinfo.gametype == GAME_Heretic)
S_ChangeMusic ("mus_intr");
else if (gameinfo.gametype == GAME_Hexen)
S_ChangeMusic ("hub");
else if (gameinfo.gametype == GAME_Strife) // Strife also needs a default!
else if (gameinfo.gametype == GAME_Strife) // Strife also needs a default
S_ChangeMusic ("d_slide");
else if (gamemode == commercial)
S_ChangeMusic ("d_dm2int");