zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-10 14:51:40 +00:00
Code Issues Projects Releases Packages Wiki Activity

always save the map WAD in a savegame's metadata, even if it is from the IWAD

Browse source 
Otherwise the savegame loader will not be able to validate an IWAD savegame while the actual level comes from a different file.
This commit is contained in:
Professor Hastig 2023-10-26 10:42:26 +02:00 committed by Rachael Alexanderson
parent 1e8b3ea65d
commit a8c1f7a637
1 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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