Autoload: dont add wads that contain maps
This commit is contained in:
1 parent
6ff1cbf4b0
commit
5577ba4c7a
3 files changed
+23
-2
No files matched your search
+10
-1
@@ -1124,9 +1124,18 @@ static void D_FindAddonsToAutoload(void)
|
||||
if (newline)
|
||||
*newline = '\0';
|
||||
|
||||
// ok so theres still issues with players adding stuff to autoload by accident
|
||||
// sometimes this stuff contains maps
|
||||
// you can probably imagine how that goes in a netgame....
|
||||
if (W_CheckAutoLoadContainsMap(wadsToAutoload))
|
||||
{
|
||||
CONS_Printf("Autoload: file %s contains map data! skipping...", wadsToAutoload);
|
||||
continue;
|
||||
}
|
||||
|
||||
if (!postload && W_CheckPostLoadList(wadsToAutoload))
|
||||
{
|
||||
CONS_Printf("forcing postload for file %s\n", wadsToAutoload);
|
||||
CONS_Printf("Autoload: forcing postload for file %s\n", wadsToAutoload);
|
||||
postload = true;
|
||||
}
|
||||
|
||||
|
||||
+12
-1
@@ -2576,6 +2576,18 @@ static int W_CheckFileContains(const char *filename, lumpchecklist_t *checklist)
|
||||
return contains;
|
||||
}
|
||||
|
||||
int W_CheckAutoLoadContainsMap(const char *filename)
|
||||
{
|
||||
// for now this checks for map marker
|
||||
static lumpchecklist_t autoloadblacklist[] =
|
||||
{
|
||||
{"MAP", 3},
|
||||
{NULL, 0},
|
||||
};
|
||||
|
||||
return W_CheckFileContains(filename, autoloadblacklist);
|
||||
}
|
||||
|
||||
int W_CheckPostLoadList(const char *filename)
|
||||
{
|
||||
static lumpchecklist_t postloadlist[] =
|
||||
@@ -2588,7 +2600,6 @@ int W_CheckPostLoadList(const char *filename)
|
||||
{"SOC_", 4},
|
||||
{"MAINCFG", 7},
|
||||
{"OBJCTCFG", 8},
|
||||
{"MAP", 3},
|
||||
|
||||
{NULL, 0},
|
||||
};
|
||||
|
||||
@@ -243,6 +243,7 @@ void W_VerifyFileMD5(UINT16 wadfilenum, const char *matchmd5);
|
||||
|
||||
int W_VerifyNMUSlumps(const char *filename, FILE *handle, boolean exit_on_error);
|
||||
|
||||
int W_CheckAutoLoadContainsMap(const char *filename);
|
||||
int W_CheckPostLoadList(const char *filename);
|
||||
|
||||
#ifdef __cplusplus
|
||||
|
||||
Reference in new issue
Block a user