zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-23 04:22:34 +00:00
Code Issues Projects Releases Packages Wiki Activity

Reintroduced discarding of custom IWAD duplicates

Browse source 
Detection of duplicated IWADs now works the same for embedded and custom IWADINFO definitions

https://forum.zdoom.org/viewtopic.php?t=58333
This commit is contained in:
alexey.lysiuk 2018-04-02 16:16:47 +03:00
parent 4de9597006
commit c70f9cf833
1 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/d_iwad.cpp
View file

@ -348,6 +348,16 @@ int FIWadManager::CheckIWADInfo(const char *fn)
FIWADInfo result; FIWADInfo result;
ParseIWadInfo(resfile->Filename, (const char*)lmp->CacheLump(), lmp->LumpSize, &result); ParseIWadInfo(resfile->Filename, (const char*)lmp->CacheLump(), lmp->LumpSize, &result);
delete resfile; delete resfile;
for (unsigned i = 0, count = mIWadInfos.Size(); i < count; ++i)
{
if (mIWadInfos[i].Name == result.Name)
{
return i;
}
}
mOrderNames.Push(result.Name);
return mIWadInfos.Push(result); return mIWadInfos.Push(result);
} }
catch (CRecoverableError &err) catch (CRecoverableError &err)