thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-04-28 04:51:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'die-less-hard' into 'master'

Browse source 
Don't clear respawn lap when dying (resolves #727)

Closes #727

See merge request KartKrew/Kart!1571
This commit is contained in:
Oni 2023-10-21 23:51:40 +00:00
commit 9a315e7e8b
1 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/g_game.c
View file

@ -2054,6 +2054,7 @@ void G_PlayerReborn(INT32 player, boolean betweenmaps)
INT32 kickstartaccel; INT32 kickstartaccel;
INT32 checkpointId; INT32 checkpointId;
boolean enteredGame; boolean enteredGame;
UINT8 lastsafelap;
roundconditions_t roundconditions; roundconditions_t roundconditions;
boolean saveroundconditions; boolean saveroundconditions;
@ -2161,6 +2162,7 @@ void G_PlayerReborn(INT32 player, boolean betweenmaps)
exiting = 0; exiting = 0;
khudfinish = 0; khudfinish = 0;
cheatchecknum = 0; cheatchecknum = 0;
lastsafelap = 0;
saveroundconditions = false; saveroundconditions = false;
tallyactive = false; tallyactive = false;
@ -2207,6 +2209,8 @@ void G_PlayerReborn(INT32 player, boolean betweenmaps)
memcpy(&roundconditions, &players[player].roundconditions, sizeof (roundconditions)); memcpy(&roundconditions, &players[player].roundconditions, sizeof (roundconditions));
saveroundconditions = true; saveroundconditions = true;
lastsafelap = players[player].lastsafelap;
tallyactive = players[player].tally.active; tallyactive = players[player].tally.active;
if (tallyactive) if (tallyactive)
{ {
@ -2275,6 +2279,7 @@ void G_PlayerReborn(INT32 player, boolean betweenmaps)
p->spectator = spectator; p->spectator = spectator;
p->steering = steering; p->steering = steering;
p->angleturn = playerangleturn; p->angleturn = playerangleturn;
p->lastsafelap = lastsafelap;
// save player config truth reborn // save player config truth reborn
p->skincolor = skincolor; p->skincolor = skincolor;