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

Merge branch 'fault-softlock' into 'master'

Browse source 
Fix FAULT softlock and spectating and rejoining

Closes #1058

See merge request KartKrew/Kart!1960
This commit is contained in:
Oni 2024-02-28 01:10:46 +00:00
commit 2204a1de8a
1 changed files with 0 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/g_game.c
View file

@ -2121,7 +2121,6 @@ void G_PlayerReborn(INT32 player, boolean betweenmaps)
INT32 itemtype; INT32 itemtype;
INT32 itemamount; INT32 itemamount;
INT32 growshrinktimer; INT32 growshrinktimer;
UINT16 nocontrol;
INT32 khudfault; INT32 khudfault;
INT32 kickstartaccel; INT32 kickstartaccel;
INT32 checkpointId; INT32 checkpointId;
@ -2227,7 +2226,6 @@ void G_PlayerReborn(INT32 player, boolean betweenmaps)
spheres = 0; spheres = 0;
kickstartaccel = 0; kickstartaccel = 0;
khudfault = 0; khudfault = 0;
nocontrol = 0;
laps = 0; laps = 0;
latestlap = 0; latestlap = 0;
lapPoints = 0; lapPoints = 0;
@ -2265,7 +2263,6 @@ void G_PlayerReborn(INT32 player, boolean betweenmaps)
kickstartaccel = players[player].kickstartaccel; kickstartaccel = players[player].kickstartaccel;
khudfault = players[player].karthud[khud_fault]; khudfault = players[player].karthud[khud_fault];
nocontrol = players[player].nocontrol;
laps = players[player].laps; laps = players[player].laps;
latestlap = players[player].latestlap; latestlap = players[player].latestlap;
@ -2397,7 +2394,6 @@ void G_PlayerReborn(INT32 player, boolean betweenmaps)
p->eggmanblame = -1; p->eggmanblame = -1;
p->lastdraft = -1; p->lastdraft = -1;
p->karthud[khud_fault] = khudfault; p->karthud[khud_fault] = khudfault;
p->nocontrol = nocontrol;
p->kickstartaccel = kickstartaccel; p->kickstartaccel = kickstartaccel;
p->checkpointId = checkpointId; p->checkpointId = checkpointId;