Merge branch 'EOL-25' into EOL

# Conflicts:
#	src/p_enemy.c
This commit is contained in:
Alam Ed Arias 2018-11-27 22:49:49 -05:00
commit b09e4ed32d

View file

@ -10900,6 +10900,10 @@ void A_FlickyCenter(mobj_t *actor)
// Now abs() extravalue1 (home radius)
if (!actor->spawnpoint)
actor->extravalue1 = abs(actor->extravalue1);
// Impose default home radius if flicky orbits around player
if (!(actor->flags & MF_SLIDEME) && !actor->extravalue1)
actor->extravalue1 = 512 * FRACUNIT;
}
if (!(actor->flags & MF_SLIDEME) && !(actor->flags & MF_NOCLIPTHING))