From 22eb12c6a86bf3285b552c4bfbebd69d7308ff18 Mon Sep 17 00:00:00 2001
From: James R <justsomejames2@gmail.com>
Date: Mon, 5 Apr 2021 01:39:17 -0700
Subject: [PATCH] Drop nospin changes

Revert 35cecad868 & fdd02e35c8
---
 src/lua_baselib.c | 22 ----------------------
 src/p_local.h     |  2 --
 src/p_map.c       | 10 +---------
 3 files changed, 1 insertion(+), 33 deletions(-)

diff --git a/src/lua_baselib.c b/src/lua_baselib.c
index 43857977c..1397f6fcf 100644
--- a/src/lua_baselib.c
+++ b/src/lua_baselib.c
@@ -1388,26 +1388,6 @@ static int lib_pSwitchShield(lua_State *L)
 	return 0;
 }
 
-static int lib_pPlayerCanEnterSpinGaps(lua_State *L)
-{
-	player_t *player = *((player_t **)luaL_checkudata(L, 1, META_PLAYER));
-	INLEVEL
-	if (!player)
-		return LUA_ErrInvalid(L, "player_t");
-	lua_pushboolean(L, P_PlayerCanEnterSpinGaps(player));
-	return 1;
-}
-
-static int lib_pPlayerShouldUseSpinHeight(lua_State *L)
-{
-	player_t *player = *((player_t **)luaL_checkudata(L, 1, META_PLAYER));
-	INLEVEL
-	if (!player)
-		return LUA_ErrInvalid(L, "player_t");
-	lua_pushboolean(L, P_PlayerShouldUseSpinHeight(player));
-	return 1;
-}
-
 // P_MAP
 ///////////
 
@@ -3879,8 +3859,6 @@ static luaL_Reg lib[] = {
 	{"P_ReturnThrustY",lib_pReturnThrustY},
 	{"P_NukeEnemies",lib_pNukeEnemies},
 	{"P_SwitchShield",lib_pSwitchShield},
-	{"P_PlayerCanEnterSpinGaps",lib_pPlayerCanEnterSpinGaps},
-	{"P_PlayerShouldUseSpinHeight",lib_pPlayerShouldUseSpinHeight},
 
 	// p_map
 	{"P_CheckPosition",lib_pCheckPosition},
diff --git a/src/p_local.h b/src/p_local.h
index 6758daa4e..a04f1f197 100644
--- a/src/p_local.h
+++ b/src/p_local.h
@@ -157,8 +157,6 @@ void P_SetPlayerAngle(player_t *player, angle_t angle);
 angle_t P_GetLocalAngle(player_t *player);
 void P_ForceLocalAngle(player_t *player, angle_t angle);
 boolean P_PlayerFullbright(player_t *player);
-boolean P_PlayerCanEnterSpinGaps(player_t *player);
-boolean P_PlayerShouldUseSpinHeight(player_t *player);
 
 boolean P_IsObjectInGoop(mobj_t *mo);
 boolean P_IsObjectOnGround(mobj_t *mo);
diff --git a/src/p_map.c b/src/p_map.c
index 642233a70..ab4f13b82 100644
--- a/src/p_map.c
+++ b/src/p_map.c
@@ -2479,10 +2479,7 @@ boolean P_TryMove(mobj_t *thing, fixed_t x, fixed_t y, boolean allowdropoff)
 			if (thing->type == MT_SKIM)
 				maxstep = 0;
 
-			if (tmceilingz - tmfloorz < thing->height
-				|| (thing->player
-					&& tmceilingz - tmfloorz < P_GetPlayerHeight(thing->player)
-					&& !P_PlayerCanEnterSpinGaps(thing->player)))
+			if (tmceilingz - tmfloorz < thing->height)
 			{
 				if (tmfloorthing)
 					tmhitthing = tmfloorthing;
@@ -3139,11 +3136,6 @@ static boolean PTR_LineIsBlocking(line_t *li)
 	if (openbottom - slidemo->z > FixedMul(MAXSTEPMOVE, mapobjectscale))
 		return true; // too big a step up
 
-	if (slidemo->player
-		&& openrange < P_GetPlayerHeight(slidemo->player)
-		&& !P_PlayerCanEnterSpinGaps(slidemo->player))
-			return true; // nonspin character should not take this path
-
 	return false;
 }