OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- moved iwadinfo.txt to zd_extra.pk3.

Browse source 
This was done for two reasons:

1. It forces loading of zd_extra.pk3 for the stock IWADs, eliminating a certain kind of user error.
2. It removes the stock IWAD definitions for custom games that distribute the engine along with their data, so that it doesn't pick up on Steam and GOG installations and shows an inappropriate IWAD picker.
This commit is contained in:
Christoph Oelckers 2019-07-16 20:22:15 +02:00
commit 38a1a05af3
4 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/d_iwad.cpp
View file

@ -262,10 +262,10 @@ void FIWadManager::ParseIWadInfo(const char *fn, const char *data, int datasize,
//
//==========================================================================
FIWadManager::FIWadManager(const char *fn)
FIWadManager::FIWadManager(const char *fn, const char *optfn)
{
FResourceFile *resfile = FResourceFile::OpenResourceFile(fn, true);
if (resfile != NULL)
FResourceFile *resfile = FResourceFile::OpenResourceFile(optfn, true);
if (resfile != NULL && 0)
{
uint32_t cnt = resfile->LumpCount();
for(int i=cnt-1; i>=0; i--)
@ -280,10 +280,10 @@ FIWadManager::FIWadManager(const char *fn)
}
}
delete resfile;
}
if (mIWadNames.Size() == 0 || mIWadInfos.Size() == 0)
{
I_FatalError("No IWAD definitions found");
if (mIWadNames.Size() == 0 || mIWadInfos.Size() == 0)
{
I_FatalError("No IWAD definitions found");
}
}
}