From 2f84de9c37937a665066d985dda33bbb00f4be92 Mon Sep 17 00:00:00 2001 From: Rachael Alexanderson Date: Fri, 25 Jan 2019 13:02:30 -0500 Subject: [PATCH] - fixed indentations caused by conflict resolution in cherry-picked commit d911fa99a121fd415472c3d5217cd9cda9f2c20a --- src/g_game.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/g_game.cpp b/src/g_game.cpp index a6b009aae..49551e4ad 100644 --- a/src/g_game.cpp +++ b/src/g_game.cpp @@ -2058,12 +2058,12 @@ static void PutSaveWads (FSerializer &arc) name = Wads.GetWadName (Wads.GetIwadNum()); 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()) - { + { name = Wads.GetWadName (Wads.GetLumpFile (level.lumpnum)); arc.AddString("Map WAD", name); - } + } } static void PutSaveComment (FSerializer &arc) @@ -2079,7 +2079,7 @@ static void PutSaveComment (FSerializer &arc) arc.AddString("Creation Time", comment); - // Get level name + // Get level name //strcpy (comment, level.level_name); comment.Format("%s - %s\n", level.MapName.GetChars(), level.LevelName.GetChars());