OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- Fixed: In P_LineOpening_3dMidtex(), set the floorpic or ceilingpic to the 3D midtex if it

Browse source 
alters the opening. This fixes things such as removing a projectile when it hits a 3D midtex
  instead of exploding it because the real floor or ceiling is sky.

SVN r3490 (trunk)
This commit is contained in:
Randy Heit 2012-03-29 05:09:56 +00:00
commit c445f684fc
4 changed files with 23 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/p_3dmidtex.cpp
View file

@ -256,23 +256,28 @@ bool P_GetMidTexturePosition(const line_t *line, int sideno, fixed_t *ptextop, f
//
//============================================================================
bool P_LineOpening_3dMidtex(AActor *thing, const line_t *linedef, fixed_t &opentop, fixed_t &openbottom, bool *above)
bool P_LineOpening_3dMidtex(AActor *thing, const line_t *linedef, FLineOpening &open)
{
fixed_t tt, tb;
*above = false;
open.abovemidtex = false;
if (P_GetMidTexturePosition(linedef, 0, &tt, &tb))
{
if (thing->z + (thing->height/2) < (tt + tb)/2)
{
if(tb < opentop) opentop = tb;
if (tb < open.top)
{
open.top = tb;
open.ceilingpic = linedef->sidedef[0]->GetTexture(side_t::mid);
}
}
else
{
if(tt > openbottom)
if (tt > open.bottom)
{
openbottom = tt;
*above = true;
open.bottom = tt;
open.abovemidtex = true;
open.floorpic = linedef->sidedef[0]->GetTexture(side_t::mid);
}
// returns true if it touches the midtexture
return (abs(thing->z - tt) <= thing->MaxStepHeight);