From 41d18bc591081690898b46dc44697e7aa67b8f80 Mon Sep 17 00:00:00 2001
From: MascaraSnake <jonassauer27@gmail.com>
Date: Tue, 21 Sep 2021 12:55:22 +0200
Subject: [PATCH] Binary-to-UDMF conversion: Set up mapthing tags before global
taglists are built
---
src/p_setup.c | 36 ++++++++++++++++++++----------------
1 file changed, 20 insertions(+), 16 deletions(-)
diff --git a/src/p_setup.c b/src/p_setup.c
index d64aff1bf5..85e558b259 100644
--- a/src/p_setup.c
+++ b/src/p_setup.c
@@ -3117,6 +3117,25 @@ static void P_AddBinaryMapTags(void)
P_AddBinaryMapTagsFromLine(lines[i].backsector, &lines[i]);
}
}
+
+ for (i = 0; i < nummapthings; i++)
+ {
+ switch (mapthings[i].type)
+ {
+ case 291:
+ case 750:
+ case 760:
+ case 761:
+ case 762:
+ Tag_FSet(&mapthings[i].tags, mapthings[i].angle);
+ break;
+ case 780:
+ Tag_FSet(&mapthings[i].tags, mapthings[i].extrainfo);
+ break;
+ default:
+ break;
+ }
+ }
}
//For maps in binary format, converts setup of specials to UDMF format.
@@ -4439,23 +4458,11 @@ static void P_ConvertBinaryMap(void)
{
switch (mapthings[i].type)
{
- case 291:
- Tag_FSet(&mapthings[i].tags, mapthings[i].angle);
- break;
- case 750:
- Tag_FSet(&mapthings[i].tags, mapthings[i].angle);
- break;
- case 760:
- case 761:
- Tag_FSet(&mapthings[i].tags, mapthings[i].angle);
- break;
case 762:
{
INT32 check = -1;
INT32 firstline = -1;
- mtag_t tag = mapthings[i].angle;
-
- Tag_FSet(&mapthings[i].tags, tag);
+ mtag_t tag = Tag_FGet(&mapthings[i].tags);
TAG_ITER_LINES(tag, check)
{
@@ -4472,9 +4479,6 @@ static void P_ConvertBinaryMap(void)
mapthings[i].type = 761;
break;
}
- case 780:
- Tag_FSet(&mapthings[i].tags, mapthings[i].extrainfo);
- break;
default:
break;
}
--
GitLab