Merge branch 'blankart-dev' into portv1objects
This commit is contained in:
commit
cc881cdabd
1 changed files with 10 additions and 2 deletions
12
src/p_spec.c
12
src/p_spec.c
|
|
@ -4836,8 +4836,16 @@ static sector_t *P_CheckPlayer3DFloorTrigger(player_t *player, sector_t *sector,
|
|||
|
||||
for (rover = sector->ffloors; rover; rover = rover->next)
|
||||
{
|
||||
if (!rover->master->frontsector->triggertag)
|
||||
continue;
|
||||
if (mapnamespace != MNS_SRB2KART)
|
||||
{
|
||||
if (!rover->master->frontsector->triggertag)
|
||||
continue;
|
||||
}
|
||||
else
|
||||
{
|
||||
if (GETSECSPECIAL(rover->master->frontsector->special, 2) < 1 || GETSECSPECIAL(rover->master->frontsector->special, 2) > 8)
|
||||
continue;
|
||||
}
|
||||
|
||||
if (rover->master->frontsector->triggerer == TO_MOBJ)
|
||||
continue;
|
||||
|
|
|
|||
Loading…
Reference in a new issue