stjr/Kart-Public
0
0
Fork 0
mirror of https://git.do.srb2.org/KartKrew/Kart-Public.git synced 2024-12-27 04:41:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

Reorganize these checks

Browse source
This commit is contained in:
Sally Cochenour 2019-01-30 15:43:45 -05:00
parent f3644505be
commit 9984f0e217
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/k_kart.c
View file

@ -3932,13 +3932,14 @@ player_t *K_FindJawzTarget(mobj_t *actor, player_t *source)
if (thisang > ANGLE_180) if (thisang > ANGLE_180)
thisang = InvAngle(thisang); thisang = InvAngle(thisang);
if (thisang > (G_RaceGametype() ? ANGLE_67h : ANGLE_45)) // Don't go for people who are behind you
continue;
// Jawz only go after the person directly ahead of you in race... sort of literally now! // Jawz only go after the person directly ahead of you in race... sort of literally now!
if (G_RaceGametype()) if (G_RaceGametype())
{ {
if (player->kartstuff[k_position] >= source->kartstuff[k_position]) // Don't pay attention to people behind you // Don't go for people who are behind you
if (thisang > ANGLE_67h)
continue;
// Don't pay attention to people who aren't above your position
if (player->kartstuff[k_position] >= source->kartstuff[k_position])
continue; continue;
if ((best == -1) || (player->kartstuff[k_position] > best)) if ((best == -1) || (player->kartstuff[k_position] > best))
{ {
@ -3951,6 +3952,11 @@ player_t *K_FindJawzTarget(mobj_t *actor, player_t *source)
fixed_t thisdist; fixed_t thisdist;
fixed_t thisavg; fixed_t thisavg;
// Don't go for people who are behind you
if (thisang > ANGLE_45)
continue;
// Don't pay attention to dead players
if (player->kartstuff[k_bumper] <= 0) if (player->kartstuff[k_bumper] <= 0)
continue; continue;