OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- moved friction flag from special to Flags as well.

Browse source
This commit is contained in:
Christoph Oelckers 2016-01-06 02:01:59 +01:00
commit 3ffcec3eb3
4 changed files with 15 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/p_spec.cpp
View file

@ -1191,9 +1191,13 @@ void P_SpawnSpecials (void)
if (sector->special & SECRET_MASK)
{
sector->Flags |= SECF_SECRET | SECF_WASSECRET;
sector->special &= ~SECRET_MASK;
level.total_secrets++;
}
if (sector->special & FRICTION_MASK)
{
sector->Flags |= SECF_FRICTION;
}
sector->special &= ~(SECRET_MASK|FRICTION_MASK);
switch (sector->special & 0xff)
{
@ -1262,7 +1266,7 @@ void P_SpawnSpecials (void)
sector->friction = FRICTION_LOW;
sector->movefactor = 0x269;
sector->special &= 0xff00;
sector->special |= FRICTION_MASK;
sector->Flags |= SECF_FRICTION;
break;
// [RH] Hexen-like phased lighting
@ -2060,11 +2064,11 @@ void P_SetSectorFriction (int tag, int amount, bool alterFlag)
// can be enabled and disabled at will.
if (friction == ORIG_FRICTION)
{
sectors[s].special &= ~FRICTION_MASK;
sectors[s].Flags &= ~SECF_FRICTION;
}
else
{
sectors[s].special |= FRICTION_MASK;
sectors[s].Flags |= SECF_FRICTION;
}
}
}