From 54af1e379edcc6a2f58034c06d0e406710adb570 Mon Sep 17 00:00:00 2001 From: MajorCooke Date: Mon, 10 Aug 2015 15:03:29 -0500 Subject: [PATCH] - Removed WARPF_MULHEIGHT. Enable its ability by default. - WARPF_ADDHEIGHT will simply change HeightOffset from multiplying to adding by default. --- src/p_local.h | 1 - src/p_things.cpp | 2 +- wadsrc/static/actors/constants.txt | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/p_local.h b/src/p_local.h index 6022d8e8e..a457cd877 100644 --- a/src/p_local.h +++ b/src/p_local.h @@ -199,7 +199,6 @@ enum WARPF WARPF_USEPTR = 0x2000, WARPF_USETID = 0x2000, WARPF_ADDHEIGHT = 0x4000, - WARPF_MULHEIGHT = 0x8000, }; diff --git a/src/p_things.cpp b/src/p_things.cpp index 1467935d7..678608dc6 100644 --- a/src/p_things.cpp +++ b/src/p_things.cpp @@ -698,7 +698,7 @@ int P_Thing_Warp(AActor *caller, AActor *reference, fixed_t xofs, fixed_t yofs, { zofs += reference->height + heightoffset; } - else if (flags & WARPF_MULHEIGHT) + else { zofs += FixedMul(reference->height, heightoffset); } diff --git a/wadsrc/static/actors/constants.txt b/wadsrc/static/actors/constants.txt index a0c6f1f98..b7baca73a 100644 --- a/wadsrc/static/actors/constants.txt +++ b/wadsrc/static/actors/constants.txt @@ -362,7 +362,6 @@ Const Int WARPF_BOB = 0x800; Const Int WARPF_MOVEPTR = 0x1000; Const Int WARPF_USETID = 0x2000; Const Int WARPF_ADDHEIGHT = 0x4000; -Const Int WARPF_MULHEIGHT = 0x8000; // flags for A_SetPitch/SetAngle/SetRoll const int SPF_FORCECLAMP = 1;