lifning
/
SRB2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'public-nights-invertloopfix' into 'next' 

NiGHTS fix lap detection on inverted axis

See merge request STJr/SRB2!300
This commit is contained in:
Digiku 2018-11-26 16:08:24 -05:00
parent 9940b53742 25361713dc
commit a2678dcb2e
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/p_map.c
View File

@ -777,14 +777,14 @@ static boolean PIT_CheckThing(mobj_t *thing)
// not (your direction) xor (stored direction) // not (your direction) xor (stored direction)
// In other words, you can't u-turn and respawn rings near the drone. // In other words, you can't u-turn and respawn rings near the drone.
if (pl->bonustime && (pl->pflags & PF_NIGHTSMODE) && (INT32)leveltime > droneobj->extravalue2 && ( if (pl->bonustime && (pl->pflags & PF_NIGHTSMODE) && (INT32)leveltime > droneobj->extravalue2 && (
!(pl->anotherflyangle >= 90 && pl->anotherflyangle <= 270) !(pl->flyangle > 90 && pl->flyangle < 270)
^ (droneobj->extravalue1 >= 90 && droneobj->extravalue1 <= 270) ^ (droneobj->extravalue1 > 90 && droneobj->extravalue1 < 270)
)) ))
{ {
// Reload all the fancy ring stuff! // Reload all the fancy ring stuff!
P_ReloadRings(); P_ReloadRings();
} }
droneobj->extravalue1 = pl->anotherflyangle; droneobj->extravalue1 = pl->flyangle;
droneobj->extravalue2 = (INT32)leveltime + TICRATE; droneobj->extravalue2 = (INT32)leveltime + TICRATE;
} }