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

Heavy as shit now

Browse source
This commit is contained in:
TehRealSalt 2018-09-04 20:51:16 -04:00
parent 1ecb8c5c8b
commit 4a7399b62d
1 changed files with 5 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/k_kart.c
View file

@ -1459,7 +1459,9 @@ static void K_GetKartBoostPower(player_t *player)
&& player->kartstuff[k_offroad] >= 0) && player->kartstuff[k_offroad] >= 0)
boostpower = FixedDiv(boostpower, player->kartstuff[k_offroad] + FRACUNIT); boostpower = FixedDiv(boostpower, player->kartstuff[k_offroad] + FRACUNIT);
if (player->kartstuff[k_bananadrag] > TICRATE) if (player->kartstuff[k_itemtype] == KITEM_KITCHENSINK)
boostpower = max((TICRATE/2), (5*TICRATE)-player->kartstuff[k_bananadrag])*boostpower/(5*TICRATE);
else if (player->kartstuff[k_bananadrag] > TICRATE)
boostpower = 4*boostpower/5; boostpower = 4*boostpower/5;
if (player->kartstuff[k_growshrinktimer] > 0) // Grow if (player->kartstuff[k_growshrinktimer] > 0) // Grow
@ -2998,8 +3000,7 @@ static void K_MoveHeldObjects(player_t *player)
mobj_t *cur = player->mo->hnext; mobj_t *cur = player->mo->hnext;
mobj_t *targ = player->mo; mobj_t *targ = player->mo;
if (P_IsObjectOnGround(player->mo) && player->speed > 0 if (P_IsObjectOnGround(player->mo) && player->speed > 0)
&& player->mo->hnext->type != MT_SINK_SHIELD) // Sink ignores debuff, and is only visible to the owner. More of a HUD indicator than an actual shield.
{ {
player->kartstuff[k_bananadrag]++; player->kartstuff[k_bananadrag]++;
if (player->kartstuff[k_bananadrag] > TICRATE) if (player->kartstuff[k_bananadrag] > TICRATE)
@ -3019,14 +3020,6 @@ static void K_MoveHeldObjects(player_t *player)
cur->flags &= ~MF_NOCLIPTHING; cur->flags &= ~MF_NOCLIPTHING;
if (cur->type == MT_SINK_SHIELD)
{
if (P_IsLocalPlayer(player))
cur->flags2 &= ~MF2_DONTDRAW;
else
cur->flags2 |= MF2_DONTDRAW;
}
if (!cur->health) if (!cur->health)
{ {
cur = cur->hnext; cur = cur->hnext;
@ -4256,8 +4249,7 @@ void K_MoveKartPlayer(player_t *player, boolean onground)
{ {
mobj_t *mo; mobj_t *mo;
player->kartstuff[k_itemheld] = 1; player->kartstuff[k_itemheld] = 1;
if (P_IsLocalPlayer(player)) S_StartSound(player->mo, sfx_s254);
S_StartSound(player->mo, sfx_s254);
mo = P_SpawnMobj(player->mo->x, player->mo->y, player->mo->z, MT_SINK_SHIELD); mo = P_SpawnMobj(player->mo->x, player->mo->y, player->mo->z, MT_SINK_SHIELD);
if (mo) if (mo)
{ {