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

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

View file

@ -4943,8 +4943,11 @@ static void GetPackets(void)
node = (SINT8)doomcom->remotenode;
if (netbuffer->packettype == PT_CLIENTJOIN && server)
{
if (!levelloading) // Otherwise just ignore
{
HandleConnect(node);
}
continue;
}
if (node == servernode && client && cl_mode != CL_SEARCHING)

View file

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

View file

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