stjr/Kart-Public
0
0
Fork 0
mirror of https://git.do.srb2.org/KartKrew/Kart-Public.git synced 2025-01-18 07:22:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'frameperfectegg' into 'master'

Browse source 
Frame Perfect Egg

See merge request KartKrew/Kart!31
This commit is contained in:
Sryder 2018-10-07 09:39:45 -04:00
commit eebde386cf
1 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/p_inter.c
View file

@ -494,11 +494,19 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck)
K_StripOther(player); K_StripOther(player);
player->kartstuff[k_itemroulette] = 1; player->kartstuff[k_itemroulette] = 1;
player->kartstuff[k_roulettetype] = 2; player->kartstuff[k_roulettetype] = 2;
if (special->target && special->target->player if (special->target && special->target->player)
&& (G_RaceGametype() || special->target->player->kartstuff[k_bumper] > 0)) {
player->kartstuff[k_eggmanblame] = special->target->player-players; if (G_RaceGametype() || special->target->player->kartstuff[k_bumper] > 0)
else player->kartstuff[k_eggmanblame] = special->target->player-players;
player->kartstuff[k_eggmanblame] = player-players; else
player->kartstuff[k_eggmanblame] = player-players;
if (special->target->hnext == special)
{
P_SetTarget(&special->target->hnext, NULL);
special->target->player->kartstuff[k_eggmanheld] = 0;
}
}
P_RemoveMobj(special); P_RemoveMobj(special);
return; return;