zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2025-01-31 04:50:48 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Removed WARPF_ADDHEIGHT.

Browse source
This commit is contained in:
MajorCooke 2015-08-10 16:05:44 -05:00
parent 54af1e379e
commit 87cc3f77f9
3 changed files with 1 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/p_local.h
View file

@ -198,7 +198,6 @@ enum WARPF
WARPF_MOVEPTR = 0x1000, WARPF_MOVEPTR = 0x1000,
WARPF_USEPTR = 0x2000, WARPF_USEPTR = 0x2000,
WARPF_USETID = 0x2000, WARPF_USETID = 0x2000,
WARPF_ADDHEIGHT = 0x4000,
}; };

9
src/p_things.cpp
View file

@ -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 oldy = caller->y;
fixed_t oldz = caller->z; fixed_t oldz = caller->z;
if (flags & WARPF_ADDHEIGHT)
{
zofs += reference->height + heightoffset;
}
else
{
zofs += FixedMul(reference->height, heightoffset); zofs += FixedMul(reference->height, heightoffset);
}
if (!(flags & WARPF_ABSOLUTEANGLE)) if (!(flags & WARPF_ABSOLUTEANGLE))
{ {

1
wadsrc/static/actors/constants.txt
View file

@ -361,7 +361,6 @@ Const Int WARPF_ABSOLUTEPOSITION = 0x400;
Const Int WARPF_BOB = 0x800; Const Int WARPF_BOB = 0x800;
Const Int WARPF_MOVEPTR = 0x1000; Const Int WARPF_MOVEPTR = 0x1000;
Const Int WARPF_USETID = 0x2000; Const Int WARPF_USETID = 0x2000;
Const Int WARPF_ADDHEIGHT = 0x4000;
// flags for A_SetPitch/SetAngle/SetRoll // flags for A_SetPitch/SetAngle/SetRoll
const int SPF_FORCECLAMP = 1; const int SPF_FORCECLAMP = 1;