OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Merge https://github.com/coelckers/gzdoom

Browse source
This commit is contained in:
Rachael Alexanderson 2017-05-19 23:40:51 -04:00
commit fd0602a163
11 changed files with 31 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/p_mobj.cpp
View file

@ -4098,6 +4098,7 @@ void AActor::Tick ()
CheckPortalTransition(false);
LinkToWorld(&ctx);
}
flags8 &= ~MF8_INSCROLLSEC;
}
else
{
@ -4250,12 +4251,16 @@ void AActor::Tick ()
// [RH] Consider carrying sectors here
DVector2 cumm(0, 0);
if ((level.Scrolls.Size() != 0 || player != NULL) && !(flags & MF_NOCLIP) && !(flags & MF_NOSECTOR))
if ((((flags8 & MF8_INSCROLLSEC) && level.Scrolls.Size() > 0) || player != NULL) && !(flags & MF_NOCLIP) && !(flags & MF_NOSECTOR))
{
double height, waterheight; // killough 4/4/98: add waterheight
const msecnode_t *node;
int countx, county;
// Clear the flag for the next frame.
flags8 &= ~MF8_INSCROLLSEC;
// killough 3/7/98: Carry things on floor
// killough 3/20/98: use new sector list which reflects true members
// killough 3/27/98: fix carrier bug
@ -5079,6 +5084,8 @@ AActor *AActor::StaticSpawn (PClassActor *type, const DVector3 &pos, replace_t a
{
level.total_secrets++;
}
// force scroller check in the first tic.
actor->flags8 |= MF8_INSCROLLSEC;
return actor;
}