stjr/UltimateZoneBuilder
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/UltimateZoneBuilder.git synced 2025-01-18 22:41:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixed, Map Analysis mode, Check Stuck Things: in some cases the check returned false-negative results.

Browse source
This commit is contained in:
MaxED 2015-04-17 13:46:55 +00:00
parent 2dff39b8bc
commit 7de6dcc780
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Source/Core/Config/ThingsFlagsCompare.cs
View file

@ -152,6 +152,9 @@ namespace CodeImp.DoomBuilder.Config
bool t1ignoreflagset = flaggrp.Value.invert ? !t1.Flags[flaggrp.Key] : t1.Flags[flaggrp.Key]; bool t1ignoreflagset = flaggrp.Value.invert ? !t1.Flags[flaggrp.Key] : t1.Flags[flaggrp.Key];
bool t2ignoreflagset = flaggrp.Value.invert ? !t2.Flags[flaggrp.Key] : t2.Flags[flaggrp.Key]; bool t2ignoreflagset = flaggrp.Value.invert ? !t2.Flags[flaggrp.Key] : t2.Flags[flaggrp.Key];
// Can be ignored?
if(!t1ignoreflagset && !t2ignoreflagset && flaggrp.Value.IgnoreGroupWhenUnset) continue;
// Can't compare... // Can't compare...
if(!t1ignoreflagset || !t2ignoreflagset) return 0; if(!t1ignoreflagset || !t2ignoreflagset) return 0;
} }

2
Source/Plugins/BuilderModes/ErrorChecks/CheckStuckThings.cs
View file

@ -221,7 +221,7 @@ namespace CodeImp.DoomBuilder.BuilderModes
// Checks if the flags of two things overlap (i.e. if they show up at the same time) // Checks if the flags of two things overlap (i.e. if they show up at the same time)
private static bool FlagsOverlap(Thing t1, Thing t2) private static bool FlagsOverlap(Thing t1, Thing t2)
{ {
if (General.Map.Config.ThingFlagsCompare.Count < 1) return false; //mxd. Bail out if no settings... if(General.Map.Config.ThingFlagsCompare.Count < 1) return true; //mxd. Otherwise, no things will ever overlap when ThingFlagsCompare is empty
int overlappinggroups = 0; int overlappinggroups = 0;
// Go through all flags in all groups and check if they overlap // Go through all flags in all groups and check if they overlap