zdoom/gzdoom-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom-gles.git synced 2024-11-24 13:11:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Removed WARPF_MULHEIGHT. Enable its ability by default.

Browse source 
- WARPF_ADDHEIGHT will simply change HeightOffset from multiplying to adding by default.
This commit is contained in:
MajorCooke 2015-08-10 15:03:29 -05:00
parent 7e661dfe57
commit 54af1e379e
3 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/p_local.h
View file

@ -199,7 +199,6 @@ enum WARPF
WARPF_USEPTR = 0x2000, WARPF_USEPTR = 0x2000,
WARPF_USETID = 0x2000, WARPF_USETID = 0x2000,
WARPF_ADDHEIGHT = 0x4000, WARPF_ADDHEIGHT = 0x4000,
WARPF_MULHEIGHT = 0x8000,
}; };

2
src/p_things.cpp
View file

@ -698,7 +698,7 @@ int P_Thing_Warp(AActor *caller, AActor *reference, fixed_t xofs, fixed_t yofs,
{ {
zofs += reference->height + heightoffset; zofs += reference->height + heightoffset;
} }
else if (flags & WARPF_MULHEIGHT) else
{ {
zofs += FixedMul(reference->height, heightoffset); zofs += FixedMul(reference->height, heightoffset);
} }

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

@ -362,7 +362,6 @@ 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; Const Int WARPF_ADDHEIGHT = 0x4000;
Const Int WARPF_MULHEIGHT = 0x8000;
// flags for A_SetPitch/SetAngle/SetRoll // flags for A_SetPitch/SetAngle/SetRoll
const int SPF_FORCECLAMP = 1; const int SPF_FORCECLAMP = 1;