From 6dfd975f88d2d08ab556762b753209414f1a9ff3 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Sun, 26 Dec 2021 17:57:17 +0100 Subject: [PATCH] - activated the user map menu item in the episode selection. --- source/core/menu/razemenu.cpp | 8 ++------ source/core/menu/usermap.cpp | 4 ++-- wadsrc/static/zscript/usermapmenu.zs | 3 +-- 3 files changed, 5 insertions(+), 10 deletions(-) diff --git a/source/core/menu/razemenu.cpp b/source/core/menu/razemenu.cpp index da289acd0..9a7f362ba 100644 --- a/source/core/menu/razemenu.cpp +++ b/source/core/menu/razemenu.cpp @@ -434,18 +434,14 @@ static void BuildEpisodeMenu() } } } -#if 0 // this needs to be backed by a working selection menu, until that gets done it must be disabled. if (!(g_gameType & GAMEFLAG_SHAREWARE)) { - //auto it = new FListMenuItemNativeStaticText(ld->mXpos, "", NIT_SmallFont); // empty entry as spacer. - //ld->mItems.Push(it); - y += ld->mLinespacing / 3; - auto it = CreateCustomListMenuItemText(ld->mXpos, y, ld->mLinespacing, 'U', "$MNU_USERMAP", ld->mFont, 0, 0, NAME_UsermapMenu); + auto it = CreateCustomListMenuItemText(ld->mXpos, y, ld->mLinespacing, 'U', "$MNU_USERMAP", ld->mFont, CR_UNTRANSLATED, 0, NAME_UsermapMenu, 0); ld->mItems.Push(it); addedVolumes++; } -#endif + if (addedVolumes == 1) { ld->mAutoselect = ld->mItems.Size() - (textadded ? 2 : 1); diff --git a/source/core/menu/usermap.cpp b/source/core/menu/usermap.cpp index c64998b86..6b269a7f7 100644 --- a/source/core/menu/usermap.cpp +++ b/source/core/menu/usermap.cpp @@ -131,8 +131,8 @@ void ReadUserMaps() { auto fn1 = fileSystem.GetFileFullName(i); if (!fn1 || !*fn1) continue; - auto map = strstr(fn1, ".map"); - if (!map || strcmp(map, ".map")) continue; + FString lowfn = fn1; + if (lowfn.Right(4).CompareNoCase(".map")) continue; if (!ValidateMap(i)) continue; InsertMap(i); } diff --git a/wadsrc/static/zscript/usermapmenu.zs b/wadsrc/static/zscript/usermapmenu.zs index 92ec194d6..d3ed5ec49 100644 --- a/wadsrc/static/zscript/usermapmenu.zs +++ b/wadsrc/static/zscript/usermapmenu.zs @@ -60,7 +60,7 @@ struct UsermapDirectory native Selected -= GetNumDirectories(); let entry = GetEntry(Selected); if (!entry) return ""; - if (entry.info.Length() > 0) return String.Format("Map %s: %s\n%s", entry.filename, entry.info, entry.container); + if (entry.info.Length() > 0) return String.Format("Map %s: %s\n%s", entry.filename, StringTable.Localize(entry.info), entry.container); return String.Format("Map %s\n%s", entry.filename, entry.container); } void Select(int Selected) @@ -171,7 +171,6 @@ class UsermapMenu : ListMenu numdirs = currentDir.GetNumDirectories(); numentries = currentDir.GetNumEntries(); NumTotalEntries = numparent + numdirs + numentries; - Console.Printf("Selects = %d", selects.Size()); } override void Drawer ()