Revert gravity changes
This commit is contained in:
parent
f1a63eaf8c
commit
4fd41ab4d5
2 changed files with 1 additions and 10 deletions
|
|
@ -10085,9 +10085,6 @@ 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)
|
||||
|
|
@ -10200,9 +10197,6 @@ 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
|
||||
|
|
@ -10914,9 +10908,6 @@ 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));
|
||||
|
||||
|
|
|
|||
|
|
@ -1249,7 +1249,7 @@ fixed_t P_GetMobjGravity(mobj_t *mo)
|
|||
gravityadd = -((gravityadd/5) + (gravityadd/8));
|
||||
}
|
||||
|
||||
gravityadd = FixedMul(gravityadd, mapobjectscale);
|
||||
gravityadd = FixedMul(gravityadd, mo->scale);
|
||||
|
||||
return gravityadd;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue