diff --git a/src/d_clisrv.c b/src/d_clisrv.c index 0f1f39fa7..709ed7c8f 100644 --- a/src/d_clisrv.c +++ b/src/d_clisrv.c @@ -4944,7 +4944,10 @@ static void GetPackets(void) if (netbuffer->packettype == PT_CLIENTJOIN && server) { - HandleConnect(node); + if (!levelloading) // Otherwise just ignore + { + HandleConnect(node); + } continue; } if (node == servernode && client && cl_mode != CL_SEARCHING) diff --git a/src/info.c b/src/info.c index 186f04022..b0a3becef 100644 --- a/src/info.c +++ b/src/info.c @@ -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 diff --git a/src/k_kart.c b/src/k_kart.c index edefc6895..03859aee6 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -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;