OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- Added Gez's submission for Eternity-style skybox definitions.

Browse source 
SVN r2151 (trunk)
This commit is contained in:
Christoph Oelckers 2010-02-06 15:31:26 +00:00
commit 4310b239f4
8 changed files with 316 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/p_linkedsectors.cpp
View file

@ -354,12 +354,22 @@ void P_AddSectorLinksByID(sector_t *control, int id, INTBOOL ceiling)
{
int movetype = ld->args[3];
// [GZ] Eternity does allow the attached sector to be the control sector,
// this permits elevator effects (ceiling attached to floors), so instead
// of checking whether the two sectors are the same, we prevent a plane
// from being attached to itself. This should be enough to do the trick.
if (ld->frontsector == control)
{
if (ceiling) movetype &= ~LINK_CEILING;
else movetype &= ~LINK_FLOOR;
}
// Make sure we have only valid combinations
movetype &= LINK_FLAGMASK;
if ((movetype & LINK_FLOORMIRROR) == LINK_FLOORMIRRORFLAG) movetype &= ~LINK_FLOORMIRRORFLAG;
if ((movetype & LINK_CEILINGMIRROR) == LINK_CEILINGMIRRORFLAG) movetype &= ~LINK_CEILINGMIRRORFLAG;
if (movetype != 0 && ld->frontsector != NULL && ld->frontsector != control)
if (movetype != 0 && ld->frontsector != NULL)//&& ld->frontsector != control) Needs to be allowed!
{
AddSingleSector(scrollplane, ld->frontsector, movetype);
}