Merge branch 'fishjump-fix' into 'next'

Fix scaling mistake in A_FishJump

Closes #939

See merge request STJr/SRB2!1915
This commit is contained in:
MascaraSnake 2023-01-07 10:32:43 +00:00
commit 71d10ec579

View file

@ -4859,12 +4859,12 @@ void A_FishJump(mobj_t *actor)
else else
{ {
if (actor->spawnpoint && actor->spawnpoint->args[0]) if (actor->spawnpoint && actor->spawnpoint->args[0])
jumpval = actor->spawnpoint->args[0]; jumpval = actor->spawnpoint->args[0] << (FRACBITS - 2);
else else
jumpval = 44; jumpval = 44 << (FRACBITS - 2);
} }
actor->momz = FixedMul(jumpval << (FRACBITS - 2), actor->scale); actor->momz = FixedMul(jumpval, actor->scale);
P_SetMobjStateNF(actor, actor->info->seestate); P_SetMobjStateNF(actor, actor->info->seestate);
} }