From aa0bd8de918fb6d19c0e352b80009254b4424c1a Mon Sep 17 00:00:00 2001
From: spherallic <spherallic@gmail.com>
Date: Tue, 30 May 2023 16:48:14 +0200
Subject: [PATCH] Revert "Fixed: 'forbidden' lumps are not supposed to count
towards matching while detecting map type"
This reverts commit c6a2288c22b3ee4c84edb139ff5364e8862a494c.
---
Source/Core/Config/MapLumpInfo.cs | 4 +---
Source/Core/General/MapManager.cs | 31 ++++++++++++-------------------
2 files changed, 13 insertions(+), 22 deletions(-)
diff --git a/Source/Core/Config/MapLumpInfo.cs b/Source/Core/Config/MapLumpInfo.cs
index c95aa386..802d3695 100644
--- a/Source/Core/Config/MapLumpInfo.cs
+++ b/Source/Core/Config/MapLumpInfo.cs
@@ -31,7 +31,6 @@ namespace CodeImp.DoomBuilder.Config
public readonly bool NodeBuild;
public readonly bool AllowEmpty;
public readonly bool ScriptBuild; //mxd
- public readonly bool Forbidden; // [ZZ]
internal readonly ScriptConfiguration Script;
// Construct from IDictionary
@@ -45,7 +44,6 @@ namespace CodeImp.DoomBuilder.Config
this.NodeBuild = cfg.ReadSetting("maplumpnames." + name + ".nodebuild", false);
this.AllowEmpty = cfg.ReadSetting("maplumpnames." + name + ".allowempty", false);
this.ScriptBuild = cfg.ReadSetting("maplumpnames." + name + ".scriptbuild", false); //mxd
- this.Forbidden = cfg.ReadSetting("maplumpnames." + name + ".forbidden", false); //mxd
string scriptconfig = cfg.ReadSetting("maplumpnames." + name + ".script", "");
// Find script configuration
@@ -62,6 +60,6 @@ namespace CodeImp.DoomBuilder.Config
}
}
}
- }
+ }
}
diff --git a/Source/Core/General/MapManager.cs b/Source/Core/General/MapManager.cs
index 467f2163..7ffcfa18 100644
--- a/Source/Core/General/MapManager.cs
+++ b/Source/Core/General/MapManager.cs
@@ -1463,19 +1463,19 @@ namespace CodeImp.DoomBuilder
// try to detect the format used for this map.
// if more than one format matches, do... idk what actually.
// todo: move this code out and call it something like DetectMapConfiguration
- List<List<MapLumpInfo>> trylists = new List<List<MapLumpInfo>>();
+ List<List<string>> trylists = new List<List<string>>();
foreach (ConfigurationInfo cinfo in General.Configs)
{
- List<MapLumpInfo> maplumps = new List<MapLumpInfo>();
+ List<string> maplumps = new List<string>();
// parse only the map lumps section of the config.
Configuration cfg = cinfo.Configuration;
IDictionary dic = cfg.ReadSetting("maplumpnames", new Hashtable());
foreach (string k in dic.Keys)
- maplumps.Add(new MapLumpInfo(k, cfg));
+ maplumps.Add(k);
// check if we already have this lump list. don't duplicate.
bool found = false;
- foreach (List<MapLumpInfo> ctrylist in trylists)
+ foreach (List<string> ctrylist in trylists)
{
if (ctrylist.Count == maplumps.Count &&
ctrylist.SequenceEqual(maplumps))
@@ -1494,26 +1494,19 @@ namespace CodeImp.DoomBuilder
// find the most probable lump list.
int maxmatches = 0;
- List<MapLumpInfo> trylist = null;
- foreach (List<MapLumpInfo> lst in trylists)
+ List<string> trylist = null;
+ foreach (List<string> lst in trylists)
{
int matches = 0;
int maxcnt = lst.Count;
int checkindex = nextindex+1;
- for (int i = 0; i < lst.Count; i++)
+ foreach (string lmp in lst)
{
if (checkindex >= target.Lumps.Count)
break;
- int mliIdx = lst.FindIndex(e => e.Name == target.Lumps[checkindex].Name);
- if (mliIdx < 0) break; // stop matching on first non-matching lump
- MapLumpInfo mli = lst[mliIdx];
- if (mli.Forbidden)
- {
- matches = 0;
- break; // completely stop matching on first forbidden lump - definitely not this configuration
- }
-
- matches++;
+ bool match = lst.Contains(target.Lumps[checkindex].Name);
+ if (match) matches++;
+ else break; // stop matching on first non-matching lump
checkindex++;
}
@@ -1530,11 +1523,11 @@ namespace CodeImp.DoomBuilder
if (reallyremove)
{
int checkindex = nextindex + 1;
- for (int i = 0; i < trylist.Count; i++)
+ foreach (string lmp in trylist)
{
if (checkindex >= target.Lumps.Count)
break;
- bool match = (trylist.FindIndex(e => e.Name == target.Lumps[checkindex].Name) >= 0);
+ bool match = trylist.Contains(target.Lumps[checkindex].Name);
if (match) target.RemoveAt(checkindex);
else break; // stop deleting on first non-matching lump
}
--
GitLab