From 24c797b7e37c8d055418fe90530b55e7f84dea60 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Sun, 22 Nov 2020 18:27:52 +0100 Subject: [PATCH] - Duke World Tour: Exiting E1L7 should go back to E1L5. fixes #187 --- source/games/duke/src/gamedef.cpp | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/source/games/duke/src/gamedef.cpp b/source/games/duke/src/gamedef.cpp index c07a4a5e2..34e26471b 100644 --- a/source/games/duke/src/gamedef.cpp +++ b/source/games/duke/src/gamedef.cpp @@ -3191,7 +3191,17 @@ void loadcons() InitGameVarPointers(); ResetSystemDefaults(); S_WorldTourMappingsForOldSounds(); // create a sound mapping for World Tour. - if (isRRRA()) + if (isWorldTour()) + { + int num = fileSystem.CheckNumForName("e1l7.map"); + int file = fileSystem.GetFileContainer(num); + if (file <= fileSystem.GetMaxIwadNum()) + { + auto maprec = FindMapByName("e1l7"); + if (maprec) maprec->nextLevel = levelnum(0, 4); + } + } + else if (isRRRA()) { // RRRA goes directly to the second episode after E1L7 to continue the game. int num = fileSystem.CheckNumForName("e1l7.map");