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

- fixed indentations caused by conflict resolution in cherry-picked commit d911fa99a1

Browse source
This commit is contained in:
Rachael Alexanderson 2019-01-25 13:02:30 -05:00
parent 06e7ca4170
commit 2f84de9c37
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/g_game.cpp
View file

@ -2058,12 +2058,12 @@ static void PutSaveWads (FSerializer &arc)
name = Wads.GetWadName (Wads.GetIwadNum()); name = Wads.GetWadName (Wads.GetIwadNum());
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 (Wads.GetLumpFile (level.lumpnum) > Wads.GetIwadNum()) if (Wads.GetLumpFile (level.lumpnum) > Wads.GetIwadNum())
{ {
name = Wads.GetWadName (Wads.GetLumpFile (level.lumpnum)); name = Wads.GetWadName (Wads.GetLumpFile (level.lumpnum));
arc.AddString("Map WAD", name); arc.AddString("Map WAD", name);
} }
} }
static void PutSaveComment (FSerializer &arc) static void PutSaveComment (FSerializer &arc)
@ -2079,7 +2079,7 @@ static void PutSaveComment (FSerializer &arc)
arc.AddString("Creation Time", comment); arc.AddString("Creation Time", comment);
// Get level name // Get level name
//strcpy (comment, level.level_name); //strcpy (comment, level.level_name);
comment.Format("%s - %s\n", level.MapName.GetChars(), level.LevelName.GetChars()); comment.Format("%s - %s\n", level.MapName.GetChars(), level.LevelName.GetChars());