From 925e05a8a0537af1760e1da730a9a475bd03e836 Mon Sep 17 00:00:00 2001 From: toaster Date: Wed, 7 Sep 2022 13:33:40 +0100 Subject: [PATCH 1/3] Sink painstate crash fix --- src/info.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/info.c b/src/info.c index 72665927e..794689a6f 100644 --- a/src/info.c +++ b/src/info.c @@ -24017,7 +24017,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 From 54e03194ea9625ad29dc65c96fb4053a851c0aa4 Mon Sep 17 00:00:00 2001 From: toaster Date: Wed, 7 Sep 2022 13:50:26 +0100 Subject: [PATCH 2/3] Ignore client joins while loading a level, to prevent a myriad of join bugs. Slightly rewritten from Jugador's, to prevent spurious DEBFILE prints of unknown packet type --- src/d_clisrv.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/d_clisrv.c b/src/d_clisrv.c index 00207d1bb..a3b8cf7fe 100644 --- a/src/d_clisrv.c +++ b/src/d_clisrv.c @@ -4646,7 +4646,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) From f901ce0f00da722ef168cc5ae1cb2bf22ef20267 Mon Sep 17 00:00:00 2001 From: toaster Date: Wed, 7 Sep 2022 14:04:22 +0100 Subject: [PATCH 3/3] Only calculate wipeout slowdown if the player's speed > 0 --- src/k_kart.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/k_kart.c b/src/k_kart.c index 9d92e8118..60d9ee48a 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -9483,7 +9483,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;