OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- Removed the unused sfx_ variables for the chainsaw sounds.

Browse source 
- Fixed map name checks in idclev, hxvisit, for +map and the titlemap.
- Changed handling of Zips so that the patches/, graphics/, sounds/ and
  music/ subdirectories no longer are placed in the global namespace. Instead
  new namespaces are defined. These namespaces aren't merged, however and 
  searching in them either returns a lump inside it or one from the global
  namespace when it doesn't come from a Zip file. Proper order of files is
  still observed though. As a result proper use of the directories inside Zips 
  is strictly enforced now so that for example anything used as a patch must be 
  in the patches/ directory and won't be found anywhere else.


SVN r199 (trunk)
This commit is contained in:
Christoph Oelckers 2006-06-19 15:31:10 +00:00
commit cf7d8ab43b
19 changed files with 95 additions and 65 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/d_main.cpp
View file

@ -810,7 +810,7 @@ void D_DoStrifeAdvanceDemo ()
case 0:
pagetic = 6 * TICRATE;
pagename = "TITLEPIC";
if (Wads.CheckNumForName ("d_logo") < 0)
if (Wads.CheckNumForName ("d_logo", ns_music) < 0)
{ // strife0.wad does not have d_logo
S_StartMusic ("");
}
@ -925,7 +925,9 @@ void D_DoAdvanceDemo (void)
// [RH] If you want something more dynamic for your title, create a map
// and name it TITLEMAP. That map will be loaded and used as the title.
if (Wads.CheckNumForName ("TITLEMAP") >= 0)
MapData * map = P_OpenMapData("TITLEMAP");
if (map != NULL)
{
G_InitNew ("TITLEMAP", true);
return;
@ -2129,12 +2131,14 @@ void D_DoomMain (void)
p = Args.CheckParm ("+map");
if (p && p < Args.NumArgs()-1)
{
if (Wads.CheckNumForName (Args.GetArg (p+1)) == -1)
MapData * map = P_OpenMapData(Args.GetArg (p+1));
if (map == NULL)
{
Printf ("Can't find map %s\n", Args.GetArg (p+1));
}
else
{
delete map;
strncpy (startmap, Args.GetArg (p+1), 8);
Args.GetArg (p)[0] = '-';
autostart = true;