mirror of
https://github.com/KartKrewDev/RingRacers.git
synced 2025-10-30 08:01:28 +00:00
p_enemy.c: All object gravity arc calculations now collaborate with mapobjectscale again.
This commit is contained in:
parent
b2bd5ecccd
commit
d046b2cb30
1 changed files with 9 additions and 3 deletions
|
|
@ -10056,6 +10056,9 @@ void A_BrakLobShot(mobj_t *actor)
|
|||
// Look up actor's current gravity situation
|
||||
g = FixedMul(gravity, P_GetSectorGravityFactor(actor->subsector->sector));
|
||||
|
||||
// Scale with map
|
||||
g = FixedMul(g, mapobjectscale);
|
||||
|
||||
// Look up distance between actor and its target
|
||||
x = P_AproxDistance(actor->target->x - actor->x, actor->target->y - actor->y);
|
||||
if (!aimDirect)
|
||||
|
|
@ -10168,6 +10171,9 @@ void A_NapalmScatter(mobj_t *actor)
|
|||
// Look up actor's current gravity situation
|
||||
g = FixedMul(gravity, P_GetSectorGravityFactor(actor->subsector->sector));
|
||||
|
||||
// Scale with map
|
||||
g = FixedMul(g, mapobjectscale);
|
||||
|
||||
// vy = (g*(airtime-1))/2
|
||||
vy = FixedMul(g,(airtime-(1<<FRACBITS)))>>1;
|
||||
// vx = distance/airtime
|
||||
|
|
@ -10879,12 +10885,12 @@ void A_Boss5Jump(mobj_t *actor)
|
|||
if (!actor->tracer)
|
||||
return; // Don't even bother if we've got nothing to aim at.
|
||||
|
||||
// Scale with map
|
||||
g = FixedMul(gravity, mapobjectscale);
|
||||
|
||||
// Look up actor's current gravity situation
|
||||
g = FixedMul(gravity, P_GetSectorGravityFactor(actor->subsector->sector));
|
||||
|
||||
// Scale with map
|
||||
g = FixedMul(g, mapobjectscale);
|
||||
|
||||
// Look up distance between actor and its tracer
|
||||
x = FixedHypot(actor->tracer->x - actor->x, actor->tracer->y - actor->y);
|
||||
// Look up height difference between actor and its tracer
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue