Slight fixes for NiGHTS LE Trigger logic

This commit is contained in:
mazmazz 2018-04-02 08:13:53 -04:00
parent 630843d76e
commit 2138706d38

View file

@ -1549,6 +1549,10 @@ static boolean P_CheckNightsTriggerLine(line_t *triggerline, mobj_t *actor)
if (donomares && P_FindLowestMare() != UINT8_MAX) if (donomares && P_FindLowestMare() != UINT8_MAX)
return false; return false;
// run only if there is a mare present
if (!donomares && P_FindLowestMare() == UINT8_MAX)
return false;
// run only if player is nightserizing from non-nights // run only if player is nightserizing from non-nights
if (fromnonights) if (fromnonights)
{ {
@ -1601,9 +1605,8 @@ static boolean P_CheckNightsTriggerLine(line_t *triggerline, mobj_t *actor)
} }
} }
} }
// get current mare/lap from triggering player // get current mare/lap from triggering player
if (!perglobal && !perglobalinverse) else if (!perglobal && !perglobalinverse)
{ {
if (!actor->player) if (!actor->player)
return false; return false;