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

Remove MF_NOSECTOR from MT_WAYPOINT, so the linedef executor can search through sector thinglist for them.

Browse source
This commit is contained in:
Sally Coolatta 2021-02-03 17:18:37 -05:00
parent 51a8d8d5cd
commit 2a2198ade1
2 changed files with 7 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/info.c
View file

@ -24278,7 +24278,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
100, // mass 100, // mass
0, // damage 0, // damage
sfx_None, // activesound sfx_None, // activesound
MF_NOBLOCKMAP|MF_NOSECTOR|MF_NOCLIP|MF_NOGRAVITY|MF_SCENERY, // flags MF_NOBLOCKMAP|MF_NOCLIP|MF_NOGRAVITY|MF_SCENERY, // flags
S_NULL // raisestate S_NULL // raisestate
}, },

15
src/p_spec.c
View file

@ -3907,10 +3907,11 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec)
case 499: // Enable/Disable Waypoints in Tagged Sectors case 499: // Enable/Disable Waypoints in Tagged Sectors
{ {
sector_t *sec; sector_t *sec;
mobj_t *waypointmobj; mobj_t *thing;
if (waypointcap == NULL) if (waypointcap == NULL)
{ {
// No point in trying at all if no waypoints exist.
break; break;
} }
@ -3918,21 +3919,17 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec)
{ {
sec = sectors + secnum; sec = sectors + secnum;
// Needs to do this instead of simply iterating through sector thing list because they have MF_NOSECTOR. for (thing = sec->thinglist; thing; thing = thing->snext)
// Maybe it'd be OK to remove, but I'd like to play it safe.
for (waypointmobj = waypointcap; waypointmobj != NULL; waypointmobj = waypointmobj->tracer)
{ {
sector_t *waypointSector = R_PointInSubsector(waypointmobj->x, waypointmobj->y)->sector; if (thing->type == MT_WAYPOINT)
if (waypointSector == sec)
{ {
if (line->flags & ML_NOCLIMB) if (line->flags & ML_NOCLIMB)
{ {
waypointmobj->extravalue1 = 1; thing->extravalue1 = 1;
} }
else else
{ {
waypointmobj->extravalue1 = 0; thing->extravalue1 = 0;
} }
} }
} }