thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'EOL-32' into EOL

Browse source 
# Conflicts:
#	src/p_enemy.c
This commit is contained in:
Alam Ed Arias 2018-11-27 23:18:14 -05:00
commit 9c1e24f7a2
1 changed files with 1 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/p_enemy.c
View file

@ -10994,7 +10994,7 @@ void A_FlickyAim(mobj_t *actor)
if (actor->target && P_IsFlickyCenter(actor->target->type)) if (actor->target && P_IsFlickyCenter(actor->target->type))
actor->angle = R_PointToAngle2(actor->target->x, actor->target->y, actor->x, actor->y) + P_RandomRange(112, 248) * ANG1; actor->angle = R_PointToAngle2(actor->target->x, actor->target->y, actor->x, actor->y) + P_RandomRange(112, 248) * ANG1;
else else
actor->angle += P_RandomRange(112, 248)*ANG1; //P_RandomRange(160, 200) * ANG1;//ANGLE_180; actor->angle += P_RandomRange(112, 248)*ANG1;
actor->threshold = 0; actor->threshold = 0;
} }
} }
@ -11048,8 +11048,6 @@ void P_InternalFlickyFly(mobj_t *actor, fixed_t flyspeed, fixed_t targetdist, fi
// var1 = how fast to fly // var1 = how fast to fly
// var2 = how far ahead the target should be considered // var2 = how far ahead the target should be considered
// //
// If MTF_EXTRA and MTF_OBJECTSPECIAL are flagged, Flicky will always fly at same Z height.
//
void A_FlickyFly(mobj_t *actor) void A_FlickyFly(mobj_t *actor)
{ {
INT32 locvar1 = var1; INT32 locvar1 = var1;
@ -11070,8 +11068,6 @@ void A_FlickyFly(mobj_t *actor)
// var1 = how fast to fly // var1 = how fast to fly
// var2 = how far ahead the target should be considered // var2 = how far ahead the target should be considered
// //
// If MTF_EXTRA and MTF_OBJECTSPECIAL are flagged, Flicky will always fly at same Z height.
//
void A_FlickySoar(mobj_t *actor) void A_FlickySoar(mobj_t *actor)
{ {
INT32 locvar1 = var1; INT32 locvar1 = var1;