From 6e276545cd8dacc1b1ec2cdfeada4433258cfdf2 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Sun, 26 Jul 2020 12:15:24 +0200 Subject: [PATCH] - fixed typo in savegame metadata reader and an issue with code execution order when exiting a level. --- source/core/savegamehelp.cpp | 2 +- source/games/duke/src/2d_d.cpp | 2 +- source/games/duke/src/premap.cpp | 5 ++++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/source/core/savegamehelp.cpp b/source/core/savegamehelp.cpp index 0dfbdb2a4..937c5ae40 100644 --- a/source/core/savegamehelp.cpp +++ b/source/core/savegamehelp.cpp @@ -314,7 +314,7 @@ int G_ValidateSavegame(FileReader &fr, FString *savetitle, bool formenu) ("Game Resource", gamegrp) ("Map Resource", mapgrp) ("Title", title) - ("Nap Label", label) + ("Map Label", label) ("Map File", filename); auto savesig = gi->GetSaveSig(); diff --git a/source/games/duke/src/2d_d.cpp b/source/games/duke/src/2d_d.cpp index b13bb255a..b9208873c 100644 --- a/source/games/duke/src/2d_d.cpp +++ b/source/games/duke/src/2d_d.cpp @@ -890,7 +890,7 @@ public: if (lastmapname) BigText(160, 20 - 6, lastmapname); 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)) { diff --git a/source/games/duke/src/premap.cpp b/source/games/duke/src/premap.cpp index 68e6d17ba..be9541b09 100644 --- a/source/games/duke/src/premap.cpp +++ b/source/games/duke/src/premap.cpp @@ -1151,9 +1151,12 @@ void exitlevel(void) gamestate = GS_STARTUP; } } + else if (exitlevelend()) + gamestate = GS_STARTUP; + }); } - if (exitlevelend()) + else if (exitlevelend()) gamestate = GS_STARTUP; }