stjr/Kart-Public
0
0
Fork 0
mirror of https://git.do.srb2.org/KartKrew/Kart-Public.git synced 2025-01-27 03:30:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'waypoint-lap-option' into 'next'

Browse source 
Add waypoint lap field via Parameter field

See merge request KartKrew/Kart-Public!4
This commit is contained in:
Sal 2019-01-03 00:58:09 -05:00
commit 220ef1a490
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/k_kart.c
View file

@ -4786,22 +4786,22 @@ void K_KartUpdatePosition(player_t *player)
mo->y - players[i].mo->y), mo->y - players[i].mo->y),
mo->z - players[i].mo->z) / FRACUNIT; mo->z - players[i].mo->z) / FRACUNIT;
if (mo->health == player->starpostnum) if (mo->health == player->starpostnum && (!mo->movecount || mo->movecount == player->laps+1))
{ {
player->kartstuff[k_prevcheck] += pmo; player->kartstuff[k_prevcheck] += pmo;
ppcd++; ppcd++;
} }
if (mo->health == (player->starpostnum + 1)) if (mo->health == (player->starpostnum + 1) && (!mo->movecount || mo->movecount == player->laps+1))
{ {
player->kartstuff[k_nextcheck] += pmo; player->kartstuff[k_nextcheck] += pmo;
pncd++; pncd++;
} }
if (mo->health == players[i].starpostnum) if (mo->health == players[i].starpostnum && (!mo->movecount || mo->movecount == players[i].laps+1))
{ {
players[i].kartstuff[k_prevcheck] += imo; players[i].kartstuff[k_prevcheck] += imo;
ipcd++; ipcd++;
} }
if (mo->health == (players[i].starpostnum + 1)) if (mo->health == (players[i].starpostnum + 1) && (!mo->movecount || mo->movecount == players[i].laps+1))
{ {
players[i].kartstuff[k_nextcheck] += imo; players[i].kartstuff[k_nextcheck] += imo;
incd++; incd++;

1
src/p_mobj.c
View file

@ -11896,6 +11896,7 @@ ML_NOCLIMB : Direction not controllable
else if (i == MT_BOSS3WAYPOINT) // SRB2kart 120217 - Used to store checkpoint num else if (i == MT_BOSS3WAYPOINT) // SRB2kart 120217 - Used to store checkpoint num
{ {
mobj->health = mthing->angle; mobj->health = mthing->angle;
mobj->movecount = mthing->extrainfo;
P_SetTarget(&mobj->tracer, waypointcap); P_SetTarget(&mobj->tracer, waypointcap);
P_SetTarget(&waypointcap, mobj); P_SetTarget(&waypointcap, mobj);
} }