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

Merge branch 'fix-duel-death' into 'master'

Browse source 
Restore duel score after true death

Closes #1542

See merge request kart-krew-dev/ring-racers-internal!2608
This commit is contained in:
TehRealSalt 2025-06-04 04:32:02 +00:00
commit 75047a630d
1 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/g_game.c
View file

@ -2281,6 +2281,8 @@ void G_PlayerReborn(INT32 player, boolean betweenmaps)
UINT8 lastsafecheatcheck; UINT8 lastsafecheatcheck;
UINT16 bigwaypointgap; UINT16 bigwaypointgap;
INT16 duelscore;
roundconditions_t roundconditions; roundconditions_t roundconditions;
boolean saveroundconditions; boolean saveroundconditions;
@ -2445,6 +2447,7 @@ void G_PlayerReborn(INT32 player, boolean betweenmaps)
lastsafelap = 0; lastsafelap = 0;
lastsafecheatcheck = 0; lastsafecheatcheck = 0;
bigwaypointgap = 0; bigwaypointgap = 0;
duelscore = 0;
tallyactive = false; tallyactive = false;
@ -2506,6 +2509,8 @@ void G_PlayerReborn(INT32 player, boolean betweenmaps)
} }
cangrabitems = players[player].cangrabitems; cangrabitems = players[player].cangrabitems;
duelscore = players[player].duelscore;
} }
spectatorReentry = (betweenmaps ? 0 : players[player].spectatorReentry); spectatorReentry = (betweenmaps ? 0 : players[player].spectatorReentry);
@ -2610,6 +2615,8 @@ void G_PlayerReborn(INT32 player, boolean betweenmaps)
p->gradingpointnum = gradingpointnum; p->gradingpointnum = gradingpointnum;
p->totalring = totalring; p->totalring = totalring;
p->duelscore = duelscore;
for (i = 0; i < LAP__MAX; i++) for (i = 0; i < LAP__MAX; i++)
{ {
p->laptime[i] = laptime[i]; p->laptime[i] = laptime[i];