thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-04-27 12:31:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'update-linedef-80' into 'master'

Browse source 
Update line special 80

See merge request KartKrew/Kart!1037
This commit is contained in:
James R 2023-03-12 03:22:36 +00:00
commit 0058d9efc3
2 changed files with 4 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/p_setup.c
View file

@ -4400,7 +4400,7 @@ static void P_ConvertBinaryLinedefTypes(void)
break; break;
case 80: //Raise tagged things by type to this FOF case 80: //Raise tagged things by type to this FOF
lines[i].args[0] = sides[lines[i].sidenum[0]].textureoffset >> FRACBITS; lines[i].args[0] = sides[lines[i].sidenum[0]].textureoffset >> FRACBITS;
// angle will be converted to tags elsewhere, because they aren't ready yet... lines[i].args[1] = tag;
break; break;
case 81: //Block enemies case 81: //Block enemies
lines[i].flags |= ML_BLOCKMONSTERS; lines[i].flags |= ML_BLOCKMONSTERS;

17
src/p_spec.c
View file

@ -6184,7 +6184,7 @@ static ffloor_t *P_AddFakeFloor(sector_t *sec, sector_t *sec2, line_t *master, I
static void static void
P_RaiseTaggedThingsToFakeFloor ( P_RaiseTaggedThingsToFakeFloor (
UINT16 type, UINT16 type,
const taglist_t *tags, mtag_t tag,
sector_t *control sector_t *control
){ ){
sector_t *target; sector_t *target;
@ -6209,20 +6209,9 @@ P_RaiseTaggedThingsToFakeFloor (
continue; continue;
} }
if (!udmf)
{
// We have to convert these here, as mobjs, let alone
// sector thing lists, don't exist at the time of the rest
// of the binary map conversion.
const mtag_t convertTag = mthing->angle;
Tag_Add(&mthing->tags, convertTag);
Taggroup_Add(tags_mapthings, convertTag, (size_t)(mthing - mapthings));
}
if ( if (
(type == 0 || mthing->type == type) && (type == 0 || mthing->type == type) &&
(tags->count == 0 || Tag_Share(&mthing->tags, tags)) (tag == 0 || udmf ? Tag_Find(&mthing->tags, tag) : mthing->angle == tag)
){ ){
if (( mo->flags2 & MF2_OBJECTFLIP )) if (( mo->flags2 & MF2_OBJECTFLIP ))
{ {
@ -7770,7 +7759,7 @@ void P_SpawnSpecialsThatRequireObjects(boolean fromnetsave)
{ {
P_RaiseTaggedThingsToFakeFloor( P_RaiseTaggedThingsToFakeFloor(
lines[i].args[0], lines[i].args[0],
&lines[i].tags, lines[i].args[1],
lines[i].frontsector lines[i].frontsector
); );
} }