thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-04-28 13:01:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'EOL-25' into EOL

Browse source 
# Conflicts:
#	src/p_enemy.c
This commit is contained in:
Alam Ed Arias 2018-11-27 22:49:49 -05:00
commit 61042de7d2
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/p_enemy.c
View file

@ -10900,6 +10900,10 @@ void A_FlickyCenter(mobj_t *actor)
// Now abs() extravalue1 (home radius) // Now abs() extravalue1 (home radius)
if (!actor->spawnpoint) if (!actor->spawnpoint)
actor->extravalue1 = abs(actor->extravalue1); 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)) if (!(actor->flags & MF_SLIDEME) && !(actor->flags & MF_NOCLIPTHING))