From 2478c15c60d096ceffb2d32b100dddd586ab35ac Mon Sep 17 00:00:00 2001
From: Brad Harding <brad@doomretro.com>
Date: Sat, 28 Sep 2024 19:54:13 +1000
Subject: [PATCH] More minor tweaks

---
 src/c_cmds.c  | 2 +-
 src/p_setup.c | 7 ++++++-
 src/p_user.c  | 9 +++++++--
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/c_cmds.c b/src/c_cmds.c
index 8688805d3..5b96dfb5c 100644
--- a/src/c_cmds.c
+++ b/src/c_cmds.c
@@ -5061,7 +5061,7 @@ static void mapstats_func2(char *cmd, char *parms)
         lump = W_CheckNumForName(lumpname);
         wadtype = lumpinfo[lump]->wadfile->type;
     }
-    else if (BTSX || KDIKDIZD)
+    else if (BTSX || KDIKDIZD || legacyofrust)
     {
         char    lumpname[6];
 
diff --git a/src/p_setup.c b/src/p_setup.c
index 403cbb29f..e852f0b7d 100644
--- a/src/p_setup.c
+++ b/src/p_setup.c
@@ -3202,7 +3202,12 @@ void P_SetupLevel(int ep, int map)
         && ((numconsolestrings == 1
             || (!M_StringStartsWith(console[numconsolestrings - 2].string, "map ")
                 && !autostart))))
-        C_Input("map %s", lumpname);
+    {
+        if (legacyofrust)
+            C_Input("map E%iM%i", maptoepisode[map], P_GetMapInEpisode(map));
+        else
+            C_Input("map %s", lumpname);
+    }
 
     if (!(samelevel = (lumpnum == prevlumpnum)))
     {
diff --git a/src/p_user.c b/src/p_user.c
index b8c04750d..c4bfce76d 100644
--- a/src/p_user.c
+++ b/src/p_user.c
@@ -215,7 +215,6 @@ void P_MovePlayer(void)
     mo->angle += ((cmd->angleturn * turbo / 100) << FRACBITS);
 
     // killough 10/98:
-    //
     // We must apply thrust to the player and bobbing separately, to avoid
     // anomalies. The thrust applied to bobbing is always the same strength on
     // ice, because the player still "works just as hard" to move, while the
@@ -310,7 +309,13 @@ static void P_DeathThink(void)
 
     weaponrumbletics = 1;
     idlechainsawrumblestrength = 0;
-    freeze = false;
+
+    if (freeze)
+    {
+        C_Input("freeze off");
+        freeze = false;
+    }
+
     infight = (infighting && !solonet && !(viewplayer->cheats & CF_NOTARGET));
 
     P_MovePlayerSprites();