stjr/Kart-Public
0
0
Fork 0
mirror of https://git.do.srb2.org/KartKrew/Kart-Public.git synced 2024-12-31 23:00:57 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'sonicitems' into encore

Browse source
This commit is contained in:
toaster 2018-08-12 11:46:21 +01:00
commit 9f107166f3
1 changed files with 17 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/k_kart.c
View file

@ -1564,7 +1564,7 @@ UINT16 K_GetKartFlashing(player_t *player)
UINT16 tics = flashingtics; UINT16 tics = flashingtics;
if (G_BattleGametype()) if (G_BattleGametype())
tics *= 2; tics *= 2;
flashingtics += (flashingtics/6) * (player->kartspeed-5); // when weight is buffed in battle, use this instead: (player->kartspeed - player->kartweight) tics += (flashingtics/6) * (player->kartspeed-5); // when weight is buffed in battle, use this instead: (player->kartspeed - player->kartweight)
return tics; return tics;
} }
@ -3177,14 +3177,23 @@ void K_KartPlayerThink(player_t *player, ticcmd_t *cmd)
if (player->kartstuff[k_eggmanexplode]) if (player->kartstuff[k_eggmanexplode])
{ {
player->kartstuff[k_eggmanexplode]--; if (player->spectator || (G_BattleGametype() && !player->kartstuff[k_bumper]))
if (player->kartstuff[k_eggmanexplode] <= 0) player->kartstuff[k_eggmanexplode] = 0;
else
{ {
mobj_t *eggsexplode; player->kartstuff[k_eggmanexplode]--;
player->powers[pw_flashing] = 0; if (player->kartstuff[k_eggmanexplode] <= 0)
eggsexplode = P_SpawnMobj(player->mo->x, player->mo->y, player->mo->z, MT_BLUEEXPLOSION); {
if (&players[player->kartstuff[k_eggmanblame]] && players[player->kartstuff[k_eggmanblame]].mo) mobj_t *eggsexplode;
P_SetTarget(&eggsexplode->target, players[player->kartstuff[k_eggmanblame]].mo); player->powers[pw_flashing] = 0;
eggsexplode = P_SpawnMobj(player->mo->x, player->mo->y, player->mo->z, MT_BLUEEXPLOSION);
if (player->kartstuff[k_eggmanblame] >= 0
&& player->kartstuff[k_eggmanblame] < MAXPLAYERS
&& playeringame[player->kartstuff[k_eggmanblame]]
&& !players[player->kartstuff[k_eggmanblame]].spectator
&& players[player->kartstuff[k_eggmanblame]].mo)
P_SetTarget(&eggsexplode->target, players[player->kartstuff[k_eggmanblame]].mo);
}
} }
} }