thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'stability-fix-ports' into 'master'

Browse source 
Stability fix ports

See merge request KartKrew/Kart!670
This commit is contained in:
James R 2022-09-17 07:08:26 +00:00
commit 1cf1643233
3 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/d_clisrv.c
View file

@ -4944,7 +4944,10 @@ static void GetPackets(void)
if (netbuffer->packettype == PT_CLIENTJOIN && server) if (netbuffer->packettype == PT_CLIENTJOIN && server)
{ {
HandleConnect(node); if (!levelloading) // Otherwise just ignore
{
HandleConnect(node);
}
continue; continue;
} }
if (node == servernode && client && cl_mode != CL_SEARCHING) if (node == servernode && client && cl_mode != CL_SEARCHING)

2
src/info.c
View file

@ -24216,7 +24216,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
sfx_tossed, // seesound sfx_tossed, // seesound
8, // reactiontime 8, // reactiontime
sfx_None, // attacksound sfx_None, // attacksound
256*FRACUNIT, // painstate S_NULL, // painstate
100, // painchance 100, // painchance
sfx_None, // painsound sfx_None, // painsound
S_NULL, // meleestate S_NULL, // meleestate

2
src/k_kart.c
View file

@ -9529,7 +9529,7 @@ void K_AdjustPlayerFriction(player_t *player)
} }
// Wipeout slowdown // Wipeout slowdown
if (player->spinouttimer && player->wipeoutslow) if (player->speed > 0 && player->spinouttimer && player->wipeoutslow)
{ {
if (player->offroad) if (player->offroad)
player->mo->friction -= 4912; player->mo->friction -= 4912;