diff --git a/src/k_kart.c b/src/k_kart.c index 2cc937198..9c57c402b 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -10032,7 +10032,9 @@ void K_KartPlayerThink(player_t *player, ticcmd_t *cmd) } */ - starttime = leveltime; + if (starttime > leveltime) + starttime = leveltime; + G_SetDemoAttackTiming(leveltime); Music_Stop("position"); diff --git a/src/p_setup.cpp b/src/p_setup.cpp index d8f91e0fd..460ccc239 100644 --- a/src/p_setup.cpp +++ b/src/p_setup.cpp @@ -8961,6 +8961,15 @@ boolean P_LoadLevel(boolean fromnetsave, boolean reloadinggamestate) I_Error("Playing binary maps is disabled; please convert to UDMF TEXTMAP and rebuild nodes."); } + if (!netgame) + { + // There is literally no reason to preserve ticcmds from a previous map + // offline, even and especially if mindelay is involved. + // Stop + D_ResetTiccmds(); + memset(netcmds, 0, sizeof(netcmds)); // This is somehow actually necessary. + } + if (!fromnetsave) { INT32 buf = gametic % BACKUPTICS;