OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- treat configurations which load a secondary WAD on top of a primary IWAD like SVE to consider the secondary WAD an actual IWAD as well.

Browse source 
This fixes localization of the SVE menu.
This commit is contained in:
Christoph Oelckers 2019-07-15 20:48:00 +02:00
commit 8177583e2f
10 changed files with 27 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/d_iwad.cpp
View file

@ -738,16 +738,20 @@ int FIWadManager::IdentifyVersion (TArray<FString> &wadfiles, const char *iwad,
D_AddFile (wadfiles, zdoom_wad);
// [SP] Load non-free assets if available. This must be done before the IWAD.
int iwadnum;
if (D_AddFile(wadfiles, optional_wad))
Wads.SetIwadNum(2);
iwadnum = 2;
else
Wads.SetIwadNum(1);
iwadnum = 1;
Wads.SetIwadNum(iwadnum);
if (picks[pick].mRequiredPath.IsNotEmpty())
{
D_AddFile (wadfiles, picks[pick].mRequiredPath);
iwadnum++;
}
D_AddFile (wadfiles, picks[pick].mFullPath);
Wads.SetMaxIwadNum(iwadnum);
auto info = mIWadInfos[picks[pick].mInfoIndex];
// Load additional resources from the same directory as the IWAD itself.