OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- Added A_Warp heightoffset property. Only has an effect by two flags.

Browse source 
- WARPF_ADDHEIGHT adds the pointed actor's height to heightoffset, and adds to the pointed actor's z position.
- WARPF_MULHEIGHT multiplies the pointed actor's height by heightoffset, and adds to the pointed actor's z position. Overridden by ADDHEIGHT.
This commit is contained in:
MajorCooke 2015-08-10 11:19:54 -05:00
commit ad14caa800
6 changed files with 23 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/p_things.cpp
View file

@ -680,7 +680,7 @@ void InitSpawnablesFromMapinfo()
}
int P_Thing_Warp(AActor *caller, AActor *reference, fixed_t xofs, fixed_t yofs, fixed_t zofs, angle_t angle, int flags)
int P_Thing_Warp(AActor *caller, AActor *reference, fixed_t xofs, fixed_t yofs, fixed_t zofs, angle_t angle, int flags, fixed_t heightoffset)
{
if (flags & WARPF_MOVEPTR)
{
@ -692,6 +692,12 @@ int P_Thing_Warp(AActor *caller, AActor *reference, fixed_t xofs, fixed_t yofs,
fixed_t oldx = caller->x;
fixed_t oldy = caller->y;
fixed_t oldz = caller->z;
fixed_t height = 0;
if (flags & WARPF_ADDHEIGHT)
height = reference->height + heightoffset;
else if (flags & WARPF_MULHEIGHT)
height = FixedMul(reference->height, heightoffset);
if (!(flags & WARPF_ABSOLUTEANGLE))
{
@ -719,7 +725,7 @@ int P_Thing_Warp(AActor *caller, AActor *reference, fixed_t xofs, fixed_t yofs,
caller->SetOrigin(
reference->x + xofs,
reference->y + yofs,
reference->z);
reference->z + height);
// now the caller's floorz should be appropriate for the assigned xy-position
// assigning position again with
@ -730,7 +736,7 @@ int P_Thing_Warp(AActor *caller, AActor *reference, fixed_t xofs, fixed_t yofs,
caller->SetOrigin(
caller->x,
caller->y,
caller->floorz + zofs);
caller->floorz + zofs + height);
}
else
{
@ -745,18 +751,18 @@ int P_Thing_Warp(AActor *caller, AActor *reference, fixed_t xofs, fixed_t yofs,
caller->SetOrigin(
reference->x + xofs,
reference->y + yofs,
reference->z + zofs);
reference->z + zofs + height);
}
}
else // [MC] The idea behind "absolute" is meant to be "absolute". Override everything, just like A_SpawnItemEx's.
{
if (flags & WARPF_TOFLOOR)
{
caller->SetOrigin(xofs, yofs, caller->floorz + zofs);
caller->SetOrigin(xofs, yofs, caller->floorz + zofs + height);
}
else
{
caller->SetOrigin(xofs, yofs, zofs);
caller->SetOrigin(xofs, yofs, zofs + height);
}
}