From 87cc3f77f9c7eccd247448c131b57ad9871bab4f Mon Sep 17 00:00:00 2001
From: MajorCooke <paul.growney22@gmail.com>
Date: Mon, 10 Aug 2015 16:05:44 -0500
Subject: [PATCH] - Removed WARPF_ADDHEIGHT.

---
 src/p_local.h                      | 1 -
 src/p_things.cpp                   | 9 +--------
 wadsrc/static/actors/constants.txt | 1 -
 3 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/src/p_local.h b/src/p_local.h
index a457cd877..a2fa00c71 100644
--- a/src/p_local.h
+++ b/src/p_local.h
@@ -198,7 +198,6 @@ enum WARPF
 	WARPF_MOVEPTR          = 0x1000,
 	WARPF_USEPTR           = 0x2000,
 	WARPF_USETID           = 0x2000,
-	WARPF_ADDHEIGHT			= 0x4000,
 };
 
 
diff --git a/src/p_things.cpp b/src/p_things.cpp
index 678608dc6..f9d85c43f 100644
--- a/src/p_things.cpp
+++ b/src/p_things.cpp
@@ -693,15 +693,8 @@ int P_Thing_Warp(AActor *caller, AActor *reference, fixed_t xofs, fixed_t yofs,
 	fixed_t	oldy = caller->y;
 	fixed_t	oldz = caller->z;
 
+	zofs += FixedMul(reference->height, heightoffset);
 
-	if (flags & WARPF_ADDHEIGHT)
-	{
-		zofs += reference->height + heightoffset;
-	}
-	else
-	{
-		zofs += FixedMul(reference->height, heightoffset);
-	}
 
 	if (!(flags & WARPF_ABSOLUTEANGLE))
 	{
diff --git a/wadsrc/static/actors/constants.txt b/wadsrc/static/actors/constants.txt
index b7baca73a..04ed6f1fc 100644
--- a/wadsrc/static/actors/constants.txt
+++ b/wadsrc/static/actors/constants.txt
@@ -361,7 +361,6 @@ Const Int WARPF_ABSOLUTEPOSITION = 0x400;
 Const Int WARPF_BOB = 0x800;
 Const Int WARPF_MOVEPTR = 0x1000;
 Const Int WARPF_USETID = 0x2000;
-Const Int WARPF_ADDHEIGHT = 0x4000;
 
 // flags for A_SetPitch/SetAngle/SetRoll
 const int SPF_FORCECLAMP = 1;