stjr
/
ZoneBuilder
mirror of https://git.do.srb2.org/STJr/ZoneBuilder.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "Fixed: 'forbidden' lumps are not supposed to count towards matching while detecting map type" 

This reverts commit c6a2288c22.
This commit is contained in:
spherallic 2023-05-30 16:48:14 +02:00
parent daf38b5bd3
commit aa0bd8de91
2 changed files with 13 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Core/Config/MapLumpInfo.cs
View File

@ -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
}
}
}
}
}
}

31
Source/Core/General/MapManager.cs
View File

@ -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
}