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

BooTake working now, maybe BooSteal does too ¯\_(ツ)_/¯

Browse source
This commit is contained in:
ZTsukei 2017-02-18 16:45:28 -05:00
parent 3fecdd7658
commit d83cbe0b72
2 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/p_spec.c
View file

@ -7113,8 +7113,8 @@ void T_Friction(friction_t *f)
// friction works for all mobj's // friction works for all mobj's
// (or at least MF_PUSHABLEs, which is all I care about anyway) // (or at least MF_PUSHABLEs, which is all I care about anyway)
if ((!(thing->flags & (MF_NOGRAVITY | MF_NOCLIP)) && thing->z == thing->floorz) && (thing->player if ((!(thing->flags & (MF_NOGRAVITY | MF_NOCLIP)) && thing->z == thing->floorz) && (thing->player
&& (thing->player->kartstuff[k_startimer] && thing->player->kartstuff[k_bootaketimer] && (thing->player->kartstuff[k_startimer] == 0 && thing->player->kartstuff[k_bootaketimer] == 0
&& thing->player->kartstuff[k_mushroomtimer] && thing->player->kartstuff[k_growshrinktimer] <= 0))) && thing->player->kartstuff[k_mushroomtimer] == 0 && thing->player->kartstuff[k_growshrinktimer] <= 0)))
{ {
if (f->roverfriction) if (f->roverfriction)
{ {

3
src/p_user.c
View file

@ -9308,12 +9308,15 @@ void P_PlayerThink(player_t *player)
// Flash player after being hit. // Flash player after being hit.
if (!(player->pflags & PF_NIGHTSMODE)) if (!(player->pflags & PF_NIGHTSMODE))
{
if (player->kartstuff[k_bootaketimer] == 0) // SRB2kart - fixes boo not flashing when it should
{ {
if (player->powers[pw_flashing] > 0 && player->powers[pw_flashing] < flashingtics && (leveltime & 1)) if (player->powers[pw_flashing] > 0 && player->powers[pw_flashing] < flashingtics && (leveltime & 1))
player->mo->flags2 |= MF2_DONTDRAW; player->mo->flags2 |= MF2_DONTDRAW;
else else
player->mo->flags2 &= ~MF2_DONTDRAW; player->mo->flags2 &= ~MF2_DONTDRAW;
} }
}
else if (player->mo->tracer) else if (player->mo->tracer)
{ {
if (player->powers[pw_flashing] & 1) if (player->powers[pw_flashing] & 1)