OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Merge remote-tracking branch 'gzdoom/master'

Browse source
This commit is contained in:
Magnus Norddahl 2023-10-27 20:44:09 +02:00
commit d93c1798f6
4 changed files with 16 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/g_game.cpp
View file

@ -1890,12 +1890,12 @@ static bool CheckSingleWad (const char *name, bool &printRequires, bool printwar
bool G_CheckSaveGameWads (FSerializer &arc, bool printwarn)
{
bool printRequires = false;
FString text;
text = arc.GetString("Game WAD");
CheckSingleWad (text.GetChars(), printRequires, printwarn);
text = arc.GetString("Map WAD");
CheckSingleWad (text.GetChars(), printRequires, printwarn);
const char *text = arc.GetString("Game WAD");
CheckSingleWad (text, printRequires, printwarn);
const char *text2 = arc.GetString("Map WAD");
// do not validate the same file twice.
if (text != nullptr && text2 != nullptr && stricmp(text, text2) != 0) CheckSingleWad (text2, printRequires, printwarn);
if (printRequires)
{
@ -2271,11 +2271,8 @@ static void PutSaveWads (FSerializer &arc)
arc.AddString("Game WAD", name);
// Name of wad the map resides in
if (fileSystem.GetFileContainer (primaryLevel->lumpnum) > fileSystem.GetIwadNum())
{
name = fileSystem.GetResourceFileName (fileSystem.GetFileContainer (primaryLevel->lumpnum));
arc.AddString("Map WAD", name);
}
name = fileSystem.GetResourceFileName (fileSystem.GetFileContainer (primaryLevel->lumpnum));
arc.AddString("Map WAD", name);
}
static void PutSaveComment (FSerializer &arc)