From 74741b4e0f58e7340ef497ed6b06e98d404a6f2e Mon Sep 17 00:00:00 2001
From: biwa <6475593+biwa@users.noreply.github.com>
Date: Sat, 10 Apr 2021 12:05:30 +0200
Subject: [PATCH] Map Analysis Mode: fixed a problem where checking for stuck
things works incorrectly in some situations (thanks to hawkwind3). Fixes #469
---
Build/Configurations/Includes/Boom_common.cfg | 1 +
Build/Configurations/Includes/Boom_misc.cfg | 22 -------------------
Build/Configurations/Includes/Doom_misc.cfg | 1 -
3 files changed, 1 insertion(+), 23 deletions(-)
diff --git a/Build/Configurations/Includes/Boom_common.cfg b/Build/Configurations/Includes/Boom_common.cfg
index 7a0a593bc..3d5a9aba7 100755
--- a/Build/Configurations/Includes/Boom_common.cfg
+++ b/Build/Configurations/Includes/Boom_common.cfg
@@ -98,6 +98,7 @@ mapformat_doom
// How to compare thing flags (for the stuck things error checker)
thingflagscompare
{
+ include("Doom_misc.cfg", "thingflagscompare");
include("Boom_misc.cfg", "thingflagscompare");
}
diff --git a/Build/Configurations/Includes/Boom_misc.cfg b/Build/Configurations/Includes/Boom_misc.cfg
index c20c32e9d..01fa35f8f 100755
--- a/Build/Configurations/Includes/Boom_misc.cfg
+++ b/Build/Configurations/Includes/Boom_misc.cfg
@@ -35,23 +35,6 @@ thingflagstranslation
// How thing flags should be compared (for the stuck thing error check)
thingflagscompare
{
- skills
- {
- 1;
- 2;
- 4;
- }
-
- gamemodes
- {
- 16
- {
- comparemethod = "equal";
- ignoredgroups = "skills";
- ingnorethisgroupwhenunset = true;
- }
- }
-
gamemodes_extra
{
optional = true;
@@ -59,16 +42,11 @@ thingflagscompare
32
{
invert = true;
- requiredflag = "16";
- requiredgroups = "gamemodes";
- ignoredgroups = "skills";
}
64
{
invert = true;
- requiredflag = "16";
- requiredgroups = "skills,gamemodes";
}
}
}
diff --git a/Build/Configurations/Includes/Doom_misc.cfg b/Build/Configurations/Includes/Doom_misc.cfg
index c6cdf1fa9..ddc3ec787 100755
--- a/Build/Configurations/Includes/Doom_misc.cfg
+++ b/Build/Configurations/Includes/Doom_misc.cfg
@@ -53,7 +53,6 @@ thingflagscompare
16
{
comparemethod = "equal";
- ignoredgroups = "skills";
ingnorethisgroupwhenunset = true;
}
}
--
GitLab