AnarchistGamers/woof
1
0
Fork 0
mirror of https://github.com/fabiangreffrath/woof.git synced 2025-09-25 05:48:03 -04:00
Code Issues Packages Projects Releases Wiki Activity

change autoload order (#173)

Browse Source 
* change autoload order

* add comments
This commit is contained in:
Roman Fomin 2021-04-21 01:44:09 +07:00 committed by GitHub
parent 1afb27ed59
commit 411874e370
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 43 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
Source/d_main.c
View File

@ -1412,6 +1412,23 @@ static void AutoLoadWADs(const char *path)
I_EndGlob(glob);
}
// auto-loading of .wad files.
static void D_AutoloadWadDir()
{
char *autoload_dir;
// common auto-loaded files for all Doom flavors
autoload_dir = GetAutoloadDir("doom-all");
AutoLoadWADs(autoload_dir);
(free)(autoload_dir);
// auto-loaded files per IWAD
autoload_dir = GetAutoloadDir(M_BaseName(wadfiles[0]));
AutoLoadWADs(autoload_dir);
(free)(autoload_dir);
}
// killough 10/98: support preloaded wads
static void D_ProcessWadPreincludes(void)
@ -1435,20 +1452,6 @@ static void D_ProcessWadPreincludes(void)
printf("\nWarning: could not open %s\n", file);
}
}
// auto-loading of .wad and .deh files.
{
char *autoload_dir;
// common auto-loaded files for all Doom flavors
autoload_dir = GetAutoloadDir("doom-all");
AutoLoadWADs(autoload_dir);
(free)(autoload_dir);
// auto-loaded files per IWAD
autoload_dir = GetAutoloadDir(M_BaseName(wadfiles[0]));
AutoLoadWADs(autoload_dir);
(free)(autoload_dir);
}
}
}
@ -1474,6 +1477,23 @@ static void AutoLoadPatches(const char *path)
I_EndGlob(glob);
}
// auto-loading of .deh files.
static void D_AutoloadDehDir()
{
char *autoload_dir;
// common auto-loaded files for all Doom flavors
autoload_dir = GetAutoloadDir("doom-all");
AutoLoadPatches(autoload_dir);
(free)(autoload_dir);
// auto-loaded files per IWAD
autoload_dir = GetAutoloadDir(M_BaseName(wadfiles[0]));
AutoLoadPatches(autoload_dir);
(free)(autoload_dir);
}
// killough 10/98: support preloaded deh/bex files
static void D_ProcessDehPreincludes(void)
@ -1503,20 +1523,6 @@ static void D_ProcessDehPreincludes(void)
}
}
}
// auto-loading of .wad and .deh files.
{
char *autoload_dir;
// common auto-loaded files for all Doom flavors
autoload_dir = GetAutoloadDir("doom-all");
AutoLoadPatches(autoload_dir);
(free)(autoload_dir);
// auto-loaded files per IWAD
autoload_dir = GetAutoloadDir(M_BaseName(wadfiles[0]));
AutoLoadPatches(autoload_dir);
(free)(autoload_dir);
}
}
}
@ -1731,6 +1737,10 @@ void D_DoomMain(void)
D_AddFile(s);
}
// add wad files from autoload directory before wads from -file parameter
D_AutoloadWadDir();
// add any files specified on the command line with -file wadfile
// to the wad list
@ -1856,6 +1866,11 @@ void D_DoomMain(void)
putchar('\n'); // killough 3/6/98: add a newline, by popular demand :)
// process deh in wads and .deh files from autoload directory
// before deh in wads from -file parameter
D_AutoloadDehDir();
D_ProcessDehInWads(); // killough 10/98: now process all deh in wads
D_ProcessDehPreincludes(); // killough 10/98: process preincluded .deh files