Fix bonus time quirk where lines are run if player->marebonuslap is 0
* Bonus laps start at 1, so if a line is looking for bonus laps, they should only be run at >= 1.
This commit is contained in:
parent
c3703cfc24
commit
61c84be704
|
@ -1641,6 +1641,9 @@ static boolean P_CheckNightsTriggerLine(line_t *triggerline, mobj_t *actor)
|
||||||
currentlap = lapfrombonustime ? actor->player->marebonuslap : actor->player->marelap;
|
currentlap = lapfrombonustime ? actor->player->marebonuslap : actor->player->marelap;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (lapfrombonustime && !currentlap)
|
||||||
|
return false; // special case: player->marebonuslap is 0 until passing through on bonus time. Don't trigger lines looking for inputlap 0.
|
||||||
|
|
||||||
// Compare current mare/lap to input mare/lap based on rules
|
// Compare current mare/lap to input mare/lap based on rules
|
||||||
if (!(specialtype >= 323 && specialtype <= 324 && donomares) // don't return false if donomares and we got this far
|
if (!(specialtype >= 323 && specialtype <= 324 && donomares) // don't return false if donomares and we got this far
|
||||||
&& ((ltemare && currentmare > inputmare)
|
&& ((ltemare && currentmare > inputmare)
|
||||||
|
|
Loading…
Reference in New Issue