zdoom/gzdoom-last-svn
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom-last-svn.git synced 2025-06-03 18:51:22 +00:00
Code Issues Projects Releases Packages Wiki Activity

* Updated to ZDoom r3018:

Browse source 
- Restore old portal checks for Action Doom 2 (as a hidden compatibility option.)

git-svn-id: http://mancubus.net/svn/hosted/gzdoom/trunk@1118 b0f79afe-0144-0410-b225-9a4edf0717df
This commit is contained in:
gez 2010-12-02 16:08:07 +00:00
parent eae3efdb2a
commit 26dbf10bb8
7 changed files with 35 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

33
src/r_plane.cpp
View file

@ -582,20 +582,27 @@ visplane_t *R_FindPlane (const secplane_t &height, FTextureID picnum, int lightl
check->viewx == stacked_viewx &&
check->viewy == stacked_viewy &&
check->viewz == stacked_viewz &&
check->alpha == alpha &&
(alpha == 0 || // if alpha is > 0 everything needs to be checked
(plane == check->height &&
picnum == check->picnum &&
lightlevel == check->lightlevel &&
xoffs == check->xoffs && // killough 2/28/98: Add offset checks
yoffs == check->yoffs &&
basecolormap == check->colormap && // [RH] Add more checks
xscale == check->xscale &&
yscale == check->yscale &&
angle == check->angle
(
// headache inducing logic... :(
(ib_compatflags & BCOMPATF_BADPORTALS) ||
(
check->alpha == alpha &&
(alpha == 0 || // if alpha is > 0 everything needs to be checked
(plane == check->height &&
picnum == check->picnum &&
lightlevel == check->lightlevel &&
xoffs == check->xoffs && // killough 2/28/98: Add offset checks
yoffs == check->yoffs &&
basecolormap == check->colormap && // [RH] Add more checks
xscale == check->xscale &&
yscale == check->yscale &&
angle == check->angle
)
) &&
check->viewangle == stacked_angle
)
) &&
check->viewangle == stacked_angle)
)
)
{
return check;
}