From e30232e1031661db756cb74d78714c4bc16b623c Mon Sep 17 00:00:00 2001
From: James R <justsomejames2@gmail.com>
Date: Thu, 29 Sep 2022 03:16:11 -0700
Subject: [PATCH] Kill last of MF2_TWOD -- toggletwod, line action 432

---
 src/d_netcmd.c   |  1 -
 src/deh_tables.c |  2 +-
 src/m_cheat.c    | 12 ------------
 src/m_cheat.h    |  1 -
 src/p_mobj.h     |  2 +-
 src/p_spec.c     | 10 ----------
 src/p_telept.c   |  2 +-
 7 files changed, 3 insertions(+), 27 deletions(-)

diff --git a/src/d_netcmd.c b/src/d_netcmd.c
index dcc351fb9..1d43a8bda 100644
--- a/src/d_netcmd.c
+++ b/src/d_netcmd.c
@@ -1094,7 +1094,6 @@ void D_RegisterClientCommands(void)
 	COM_AddCommand("rteleport", Command_RTeleport_f);
 	COM_AddCommand("skynum", Command_Skynum_f);
 	COM_AddCommand("weather", Command_Weather_f);
-	COM_AddCommand("toggletwod", Command_Toggletwod_f);
 #ifdef _DEBUG
 	COM_AddCommand("causecfail", Command_CauseCfail_f);
 #endif
diff --git a/src/deh_tables.c b/src/deh_tables.c
index a0084ec85..be283371e 100644
--- a/src/deh_tables.c
+++ b/src/deh_tables.c
@@ -5649,7 +5649,7 @@ const char *const MOBJFLAG_LIST[] = {
 // \tMF2_(\S+).*// (.+) --> \t"\1", // \2
 const char *const MOBJFLAG2_LIST[] = {
 	"AXIS",			  // It's a NiGHTS axis! (For faster checking)
-	"TWOD",			  // Moves like it's in a 2D level
+	"\x01",			  // free: 1<<1 (name un-matchable)
 	"DONTRESPAWN",	  // Don't respawn this object!
 	"\x01",			  // free: 1<<3 (name un-matchable)
 	"AUTOMATIC",	  // Thrown ring has automatic properties
diff --git a/src/m_cheat.c b/src/m_cheat.c
index 98043cd2d..a17e33d4b 100644
--- a/src/m_cheat.c
+++ b/src/m_cheat.c
@@ -651,18 +651,6 @@ void Command_Weather_f(void)
 	P_SwitchWeather(atoi(COM_Argv(1)));
 }
 
-void Command_Toggletwod_f(void)
-{
-	player_t *p = &players[consoleplayer];
-
-	REQUIRE_CHEATS;
-	REQUIRE_INLEVEL;
-	REQUIRE_SINGLEPLAYER; // TODO: make multiplayer compatible
-
-	if (p->mo)
-		p->mo->flags2 ^= MF2_TWOD;
-}
-
 #ifdef _DEBUG
 // You never thought you needed this, did you? >=D
 // Yes, this has the specific purpose of completely screwing you up
diff --git a/src/m_cheat.h b/src/m_cheat.h
index ec1a129cf..2f82c71ec 100644
--- a/src/m_cheat.h
+++ b/src/m_cheat.h
@@ -56,7 +56,6 @@ void Command_Teleport_f(void);
 void Command_RTeleport_f(void);
 void Command_Skynum_f(void);
 void Command_Weather_f(void);
-void Command_Toggletwod_f(void);
 #ifdef _DEBUG
 void Command_CauseCfail_f(void);
 #endif
diff --git a/src/p_mobj.h b/src/p_mobj.h
index 4cdacea6d..34329107b 100644
--- a/src/p_mobj.h
+++ b/src/p_mobj.h
@@ -169,7 +169,7 @@ typedef enum
 typedef enum
 {
 	MF2_AXIS           = 1,     // It's a NiGHTS axis! (For faster checking)
-	MF2_TWOD           = 1<<1,  // Moves like it's in a 2D level
+	// free: 1<<1
 	MF2_DONTRESPAWN    = 1<<2,  // Don't respawn this object!
 	// free: 1<<3
 	MF2_AUTOMATIC      = 1<<4,  // Thrown ring has automatic properties
diff --git a/src/p_spec.c b/src/p_spec.c
index b8c103f70..cd5d922fb 100644
--- a/src/p_spec.c
+++ b/src/p_spec.c
@@ -2836,16 +2836,6 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec)
 			EV_DoCrush(line, crushBothOnce);
 			break;
 
-		case 432: // Enable 2D Mode (Disable if noclimb)
-			if (mo && mo->player)
-			{
-				if (line->flags & ML_NOCLIMB)
-					mo->flags2 &= ~MF2_TWOD;
-				else
-					mo->flags2 |= MF2_TWOD;
-			}
-			break;
-
 		case 433: // Flip gravity (Flop gravity if noclimb) Works on pushables, too!
 			if (line->flags & ML_NOCLIMB)
 				mo->flags2 &= ~MF2_OBJECTFLIP;
diff --git a/src/p_telept.c b/src/p_telept.c
index 59774dd76..530830ad3 100644
--- a/src/p_telept.c
+++ b/src/p_telept.c
@@ -35,7 +35,7 @@ void P_MixUp(mobj_t *thing, fixed_t x, fixed_t y, fixed_t z, angle_t angle,
 			INT32 starpostnum, tic_t starposttime, angle_t starpostangle,
 			fixed_t starpostscale, angle_t drawangle, INT32 flags2)
 {
-	const INT32 takeflags2 = MF2_TWOD|MF2_OBJECTFLIP;
+	const INT32 takeflags2 = MF2_OBJECTFLIP;
 	UINT8 i;
 
 	(void)starposttime;