From c677b91c2828e36eb48ffceb81ee518275c4f4da Mon Sep 17 00:00:00 2001 From: Roman Fomin Date: Sun, 31 Oct 2021 00:19:23 +0700 Subject: [PATCH] fix episode menu for chex.wad (#333) * fix episode menu for chex.wad * move partime to deh, fix secret exit * remove redundant record --- Source/m_menu.c | 3 ++- autoload/chex.wad/extchex.deh | 7 +++++++ autoload/chex.wad/umapdef.lmp | 15 +-------------- 3 files changed, 10 insertions(+), 15 deletions(-) diff --git a/Source/m_menu.c b/Source/m_menu.c index 15e1786c..7bfa2132 100644 --- a/Source/m_menu.c +++ b/Source/m_menu.c @@ -564,6 +564,7 @@ int epiChoice; void M_ClearEpisodes(void) { EpiDef.numitems = 0; + NewDef.prevMenu = &MainDef; } void M_AddEpisode(const char *map, const char *gfx, const char *txt, const char *alpha) @@ -696,7 +697,7 @@ void M_NewGame(int choice) return; } - if ( ((gamemode == commercial) && !EpiCustom) || EpiDef.numitems == 1) + if ( ((gamemode == commercial) && !EpiCustom) || EpiDef.numitems == 0) M_SetupNextMenu(&NewDef); else { diff --git a/autoload/chex.wad/extchex.deh b/autoload/chex.wad/extchex.deh index c6544490..613969f2 100644 --- a/autoload/chex.wad/extchex.deh +++ b/autoload/chex.wad/extchex.deh @@ -42,3 +42,10 @@ HUSTR_E4M6 = E1M5: Caverns of Bazoik HUSTR_E4M7 = E1M5: Caverns of Bazoik HUSTR_E4M8 = E1M5: Caverns of Bazoik HUSTR_E4M9 = E1M5: Caverns of Bazoik + +[PARS] +par 1 1 120 +par 1 2 360 +par 1 3 480 +par 1 4 200 +par 1 5 360 diff --git a/autoload/chex.wad/umapdef.lmp b/autoload/chex.wad/umapdef.lmp index f1e2ea6a..2a52a36b 100644 --- a/autoload/chex.wad/umapdef.lmp +++ b/autoload/chex.wad/umapdef.lmp @@ -1,27 +1,14 @@ map E1M1 { episode = clear - episode = "", "Chex Quest", "c" - partime = 120 -} - -map E1M2 -{ - partime = 360 } map E1M3 { - partime = 480 -} - -map E1M4 -{ - partime = 200 + nextsecret = "E1M4" } map E1M5 { endgame = true - partime = 360 }