- fixed typo in savegame metadata reader and an issue with code execution order when exiting a level.

This commit is contained in:
Christoph Oelckers 2020-07-26 12:15:24 +02:00
parent 1207e02e5d
commit 6e276545cd
3 changed files with 6 additions and 3 deletions

View file

@ -314,7 +314,7 @@ int G_ValidateSavegame(FileReader &fr, FString *savetitle, bool formenu)
("Game Resource", gamegrp) ("Game Resource", gamegrp)
("Map Resource", mapgrp) ("Map Resource", mapgrp)
("Title", title) ("Title", title)
("Nap Label", label) ("Map Label", label)
("Map File", filename); ("Map File", filename);
auto savesig = gi->GetSaveSig(); auto savesig = gi->GetSaveSig();

View file

@ -890,7 +890,7 @@ public:
if (lastmapname) BigText(160, 20 - 6, lastmapname); if (lastmapname) BigText(160, 20 - 6, lastmapname);
BigText(160, 36 - 6, GStrings("Completed")); BigText(160, 36 - 6, GStrings("Completed"));
GameText(160, 192, GStrings("PRESSKEY"), 8 - int(sin(totalclock / 10.) * 8), 0); GameText(160, 190, GStrings("PRESSKEY"), 8 - int(sin(totalclock / 10.) * 8), 0);
if (totalclock > (60 * 3)) if (totalclock > (60 * 3))
{ {

View file

@ -1151,9 +1151,12 @@ void exitlevel(void)
gamestate = GS_STARTUP; gamestate = GS_STARTUP;
} }
} }
else if (exitlevelend())
gamestate = GS_STARTUP;
}); });
} }
if (exitlevelend()) else if (exitlevelend())
gamestate = GS_STARTUP; gamestate = GS_STARTUP;
} }