thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'turbine-dash-ring-unfuck' into 'master'

Browse source 
What the fuck are turbines (resolves #724 probably)

Closes #724

See merge request KartKrew/Kart!1789
This commit is contained in:
Oni 2024-01-07 08:52:51 +00:00
commit bc60668f27
2 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/objects/dash-rings.c
View file

@ -138,6 +138,7 @@ void Obj_DashRingTouch(mobj_t *ring, player_t *player)
player->carry = CR_DASHRING;
player->dashRingPullTics = DASHRING_PULL_TICS;
player->dashRingPushTics = 0;
player->turbine = 0;
}
static fixed_t GetPlayerDashRingZ(player_t *player, mobj_t *ring)

1
src/p_user.c
View file

@ -482,6 +482,7 @@ void P_ResetPlayer(player_t *player)
player->trickpanel = TRICKSTATE_NONE;
player->glanceDir = 0;
player->fastfall = 0;
player->turbine = 0;
Obj_EndBungee(player);
if (player->mo != NULL && P_MobjWasRemoved(player->mo) == false)