OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- ZDoom now loads zdoom.pk3 instead of zdoom.wad.

Browse source 
- Fixed: StreamSong::SetVolume should check the m_stream pointer. This can
  happen when a TimiditySong doesn't use FMOD and outputs the sound itself.
- Fixed: 'use' sector actions were using the incorrect sector on several 
  occasions.
- Added a wi_noautostartmap CVAR and a noautostartmap intermission option
  that force the user to manually end the 'entering level' page.


SVN r70 (trunk)
This commit is contained in:
Christoph Oelckers 2006-04-29 12:40:09 +00:00
commit eff7c898cf
16 changed files with 198 additions and 162 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/d_main.cpp
View file

@ -1921,14 +1921,14 @@ void D_DoomMain (void)
M_FindResponseFile ();
M_LoadDefaults (); // load before initing other systems
// [RH] Make sure zdoom.wad is always loaded,
// [RH] Make sure zdoom.pk3 is always loaded,
// as it contains magic stuff we need.
wad = BaseFileSearch ("zdoom.wad", NULL, true);
wad = BaseFileSearch ("zdoom.pk3", NULL, true);
if (wad)
D_AddFile (wad);
else
I_FatalError ("Cannot find zdoom.wad");
I_FatalError ("Cannot find zdoom.pk3");
I_SetTitleString (IWADTypeNames[IdentifyVersion ()]);
GameConfig->DoGameSetup (GameNames[gameinfo.gametype]);