stjr/Kart-Public
0
0
Fork 0
mirror of https://git.do.srb2.org/KartKrew/Kart-Public.git synced 2025-02-22 11:51:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

merge SOC_****, MAINCFG and OBJCTCFG searches into one big search for any of them

Browse source 
This makes it so that it doesn't matter what order you place SOC lumps within a WAD... relative to other SOC lumps at least, anyway
This commit is contained in:
Monster Iestyn 2016-01-30 17:19:05 +00:00
parent 5cae87430f
commit cd198d6809
1 changed files with 11 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/w_wad.c
View file

@ -150,32 +150,22 @@ static inline void W_LoadDehackedLumps(UINT16 wadnum)
{ {
lumpinfo_t *lump_p = wadfiles[wadnum]->lumpinfo; lumpinfo_t *lump_p = wadfiles[wadnum]->lumpinfo;
for (lump = 0; lump < wadfiles[wadnum]->numlumps; lump++, lump_p++) for (lump = 0; lump < wadfiles[wadnum]->numlumps; lump++, lump_p++)
if (memcmp(lump_p->name,"SOC_",4)==0) if (memcmp(lump_p->name,"SOC_",4)==0) // Check for generic SOC lump
{ {
CONS_Printf(M_GetText("Loading SOC from %s\n"), wadfiles[wadnum]->filename); CONS_Printf(M_GetText("Loading SOC from %s\n"), wadfiles[wadnum]->filename);
DEH_LoadDehackedLumpPwad(wadnum, lump); DEH_LoadDehackedLumpPwad(wadnum, lump);
} }
} else if (memcmp(lump_p->name,"MAINCFG",8)==0) // Check for MAINCFG
// Check for MAINCFG
for (lump = 0;lump != INT16_MAX;lump++)
{ {
lump = W_CheckNumForNamePwad("MAINCFG", wadnum, lump);
if (lump == INT16_MAX)
break;
CONS_Printf(M_GetText("Loading main config from %s\n"), wadfiles[wadnum]->filename); CONS_Printf(M_GetText("Loading main config from %s\n"), wadfiles[wadnum]->filename);
DEH_LoadDehackedLumpPwad(wadnum, lump); DEH_LoadDehackedLumpPwad(wadnum, lump);
} }
else if (memcmp(lump_p->name,"OBJCTCFG",8)==0) // Check for OBJCTCFG
// Check for OBJCTCFG
for (lump = 0;lump < INT16_MAX;lump++)
{ {
lump = W_CheckNumForNamePwad("OBJCTCFG", wadnum, lump);
if (lump == INT16_MAX)
break;
CONS_Printf(M_GetText("Loading object config from %s\n"), wadfiles[wadnum]->filename); CONS_Printf(M_GetText("Loading object config from %s\n"), wadfiles[wadnum]->filename);
DEH_LoadDehackedLumpPwad(wadnum, lump); DEH_LoadDehackedLumpPwad(wadnum, lump);
} }
}
#ifdef SCANTHINGS #ifdef SCANTHINGS
// Scan maps for emblems 'n shit // Scan maps for emblems 'n shit