thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Race Duel: endcam fixup

Browse source
This commit is contained in:
Antonio Martinez 2024-09-10 15:31:48 -07:00
parent 2a42d664f0
commit 62e8b435aa
1 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/k_kart.c
View file

@ -4184,7 +4184,7 @@ void K_CheckpointCrossAward(player_t *player)
if (overtimecheckpoints > 1) if (overtimecheckpoints > 1)
K_AddMessage(va("Margin Boost x%d!", overtimecheckpoints), true, false); K_AddMessage(va("Margin Boost x%d!", overtimecheckpoints), true, false);
else else
K_AddMessage(va("Margin Boost!", overtimecheckpoints), true, false); K_AddMessage("Margin Boost!", true, false);
S_StartSound(NULL, sfx_gsha6); S_StartSound(NULL, sfx_gsha6);
} }
@ -4196,15 +4196,11 @@ void K_CheckpointCrossAward(player_t *player)
if (player->duelscore == DUELWINNINGSCORE) if (player->duelscore == DUELWINNINGSCORE)
{ {
S_StartSound(NULL, sfx_s3k6a);
P_DoPlayerExit(player, 0);
P_DoAllPlayersExit(PF_NOCONTEST, 0);
player_t *opp = K_DuelOpponent(player); player_t *opp = K_DuelOpponent(player);
opp->position = 2; opp->position = 2;
player->position = 1; player->position = 1;
if (opp->distancetofinish - player->distancetofinish < 200) if (opp->distancetofinish - player->distancetofinish < 200) // Setting player.exiting changes distance reporting, check these first!
{ {
K_StartRoundWinCamera( K_StartRoundWinCamera(
player->mo, player->mo,
@ -4215,6 +4211,9 @@ void K_CheckpointCrossAward(player_t *player)
); );
} }
S_StartSound(NULL, sfx_s3k6a);
P_DoPlayerExit(player, 0);
P_DoAllPlayersExit(PF_NOCONTEST, 0);
} }
else else
{ {
@ -9491,6 +9490,14 @@ void K_KartPlayerThink(player_t *player, ticcmd_t *cmd)
player->amppickup--; player->amppickup--;
} }
// ACHTUNG TEMPORARY FUCKUP.
// Disable skip protection in Race Duel because of distance jumps in infinite-lap contexts.
// This shouldn't exist at all in release 2.4, so this is probably fine, right...?
if (K_InRaceDuel())
{
player->pflags |= PF_TRUSTWAYPOINTS;
}
// Don't tick down while in damage state. // Don't tick down while in damage state.
// There may be some maps where the timer activates for // There may be some maps where the timer activates for