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

Gachabom: switch to lobbed mode before trajectory is set

Browse source 
Fixes lobbed Gachabom trajectory being inconsistent with
other lobbed items.
This commit is contained in:
James R 2023-05-11 19:17:37 -07:00
parent 327edf9831
commit e628d153ad
1 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
src/k_kart.c
View file

@ -5424,22 +5424,6 @@ mobj_t *K_ThrowKartItem(player_t *player, boolean missile, mobjtype_t mapthing,
if (!player) if (!player)
return NULL; return NULL;
// Figure out projectile speed by game speed
if (missile)
{
// Use info->speed for missiles
PROJSPEED = FixedMul(mobjinfo[mapthing].speed, K_GetKartGameSpeedScalar(gamespeed));
}
else
{
// Use pre-determined speed for tossing
PROJSPEED = FixedMul(82 * FRACUNIT, K_GetKartGameSpeedScalar(gamespeed));
}
// Scale to map scale
// Intentionally NOT player scale, that doesn't work.
PROJSPEED = FixedMul(PROJSPEED, mapobjectscale);
if (altthrow) if (altthrow)
{ {
if (altthrow == 2) // Kitchen sink throwing if (altthrow == 2) // Kitchen sink throwing
@ -5482,6 +5466,22 @@ mobj_t *K_ThrowKartItem(player_t *player, boolean missile, mobjtype_t mapthing,
missile = false; missile = false;
} }
// Figure out projectile speed by game speed
if (missile)
{
// Use info->speed for missiles
PROJSPEED = FixedMul(mobjinfo[mapthing].speed, K_GetKartGameSpeedScalar(gamespeed));
}
else
{
// Use pre-determined speed for tossing
PROJSPEED = FixedMul(82 * FRACUNIT, K_GetKartGameSpeedScalar(gamespeed));
}
// Scale to map scale
// Intentionally NOT player scale, that doesn't work.
PROJSPEED = FixedMul(PROJSPEED, mapobjectscale);
if (missile) // Shootables if (missile) // Shootables
{ {
if (dir < 0 && mapthing != MT_SPB && mapthing != MT_GARDENTOP) if (dir < 0 && mapthing != MT_SPB && mapthing != MT_GARDENTOP)