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

Minor fixes

Browse source
This commit is contained in:
TehRealSalt 2017-11-05 20:41:54 -05:00
parent 98afcbbd5a
commit 8756293906
2 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/g_game.c
View file

@ -2305,6 +2305,7 @@ void G_PlayerReborn(INT32 player)
p->kartstuff[k_starpostwp] = starpostwp; // TODO: get these out of kartstuff, it causes desync p->kartstuff[k_starpostwp] = starpostwp; // TODO: get these out of kartstuff, it causes desync
p->kartstuff[k_offroad] = offroad; p->kartstuff[k_offroad] = offroad;
p->kartstuff[k_balloon] = balloon; p->kartstuff[k_balloon] = balloon;
p->kartstuff[k_comebacktimer] = comebacktime;
// Don't do anything immediately // Don't do anything immediately
p->pflags |= PF_USEDOWN; p->pflags |= PF_USEDOWN;

8
src/k_kart.c
View file

@ -1683,8 +1683,10 @@ void K_SpinPlayer(player_t *player, mobj_t *source)
} }
if (source && source->player && player != source->player) if (source && source->player && player != source->player)
{
P_AddPlayerScore(source->player, 1); P_AddPlayerScore(source->player, 1);
source->player->kartstuff[k_comebacktimer] = comebacktime; source->player->kartstuff[k_comebacktimer] = comebacktime;
}
K_CheckBalloons(); K_CheckBalloons();
} }
@ -1741,8 +1743,10 @@ void K_SquishPlayer(player_t *player, mobj_t *source)
} }
if (source && source->player && player != source->player) if (source && source->player && player != source->player)
{
P_AddPlayerScore(source->player, 1); P_AddPlayerScore(source->player, 1);
source->player->kartstuff[k_comebacktimer] = comebacktime; source->player->kartstuff[k_comebacktimer] = comebacktime;
}
K_CheckBalloons(); K_CheckBalloons();
} }
@ -1788,8 +1792,10 @@ void K_ExplodePlayer(player_t *player, mobj_t *source) // A bit of a hack, we ju
} }
if (source && source->player && player != source->player) if (source && source->player && player != source->player)
{
P_AddPlayerScore(source->player, 1); P_AddPlayerScore(source->player, 1);
source->player->kartstuff[k_comebacktimer] = comebacktime; source->player->kartstuff[k_comebacktimer] = comebacktime;
}
K_CheckBalloons(); K_CheckBalloons();
} }
@ -3296,7 +3302,7 @@ void K_MoveKartPlayer(player_t *player, boolean onground)
else else
player->mo->flags2 &= ~MF2_DONTDRAW; player->mo->flags2 &= ~MF2_DONTDRAW;
} }
else if (player->kartstuff[k_balloon] > 0) else if (gametype == GT_RACE || player->kartstuff[k_balloon] > 0)
player->mo->flags2 &= ~MF2_DONTDRAW; player->mo->flags2 &= ~MF2_DONTDRAW;
} }
} }