thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-04-28 04:51:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Obj_RingShooterInput: Fix several issues with the to-spot teleport

Browse source 
- Fix undesired fastfall bounce
- Fix reverse gravity
This commit is contained in:
toaster 2023-04-14 20:19:00 +01:00 • committed by Sally Coolatta
parent 5b348ee195
commit e7896a7118
1 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/objects/ring-shooter.c
View file

@ -695,11 +695,24 @@ void Obj_RingShooterInput(player_t *player)
{ {
player->mo->momx = player->mo->momy = 0; player->mo->momx = player->mo->momy = 0;
P_SetPlayerAngle(player, base->angle); P_SetPlayerAngle(player, base->angle);
fixed_t setz;
if (base->eflags & MFE_VERTICALFLIP)
{
setz = base->z + base->height - player->mo->height;
setz = max(setz, player->mo->z);
}
else
{
setz = min(player->mo->z, base->z);
}
P_MoveOrigin( P_MoveOrigin(
player->mo, player->mo,
base->x, base->y, base->x, base->y,
base->z // TODO: reverse gravity setz
); );
player->fastfall = 0;
if (base->fuse < RS_FUSE_TIME) if (base->fuse < RS_FUSE_TIME)
{ {