stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2025-02-01 22:21:05 +00:00
Code Issues Projects Releases Packages Wiki Activity

Binary-to-UDMF conversion: Set up mapthing tags before global taglists are built

Browse source
This commit is contained in:
MascaraSnake 2021-09-21 12:55:22 +02:00
parent d47069fbb6
commit 41d18bc591
1 changed files with 20 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
src/p_setup.c
View file

@ -3117,6 +3117,25 @@ static void P_AddBinaryMapTags(void)
P_AddBinaryMapTagsFromLine(lines[i].backsector, &lines[i]); 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. //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) 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: case 762:
{ {
INT32 check = -1; INT32 check = -1;
INT32 firstline = -1; INT32 firstline = -1;
mtag_t tag = mapthings[i].angle; mtag_t tag = Tag_FGet(&mapthings[i].tags);
Tag_FSet(&mapthings[i].tags, tag);
TAG_ITER_LINES(tag, check) TAG_ITER_LINES(tag, check)
{ {
@ -4472,9 +4479,6 @@ static void P_ConvertBinaryMap(void)
mapthings[i].type = 761; mapthings[i].type = 761;
break; break;
} }
case 780:
Tag_FSet(&mapthings[i].tags, mapthings[i].extrainfo);
break;
default: default:
break; break;
} }