mirror of
https://github.com/KartKrewDev/RingRacers.git
synced 2026-05-10 10:51:42 +00:00
Merge branch 'invinc-extra-tripwire-leniency' into 'master'
More tripwire leniency after invinc + fixed netgame crash caused by rocketsneaker boost type separation See merge request kart-krew-dev/ring-racers-internal!2609
This commit is contained in:
commit
4eb4f896ac
2 changed files with 6 additions and 0 deletions
|
|
@ -9816,6 +9816,11 @@ void K_KartPlayerThink(player_t *player, ticcmd_t *cmd)
|
||||||
player->invincibilitytimer--;
|
player->invincibilitytimer--;
|
||||||
if (player->invincibilitytimer && K_IsPlayerScamming(player))
|
if (player->invincibilitytimer && K_IsPlayerScamming(player))
|
||||||
player->invincibilitytimer--;
|
player->invincibilitytimer--;
|
||||||
|
|
||||||
|
// Extra tripwire leniency for the end of invincibility
|
||||||
|
if (player->invincibilitytimer <= 0) {
|
||||||
|
player->tripwireLeniency = max( player->tripwireLeniency, TICRATE );
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// The precise ordering of start-of-level made me want to cut my head off,
|
// The precise ordering of start-of-level made me want to cut my head off,
|
||||||
|
|
|
||||||
|
|
@ -1198,6 +1198,7 @@ static void P_NetUnArchivePlayers(savebuffer_t *save)
|
||||||
players[i].numsneakers = READUINT8(save->p);
|
players[i].numsneakers = READUINT8(save->p);
|
||||||
players[i].panelsneakertimer = READUINT16(save->p);
|
players[i].panelsneakertimer = READUINT16(save->p);
|
||||||
players[i].numpanelsneakers = READUINT8(save->p);
|
players[i].numpanelsneakers = READUINT8(save->p);
|
||||||
|
players[i].weaksneakertimer = READUINT16(save->p);
|
||||||
players[i].numweaksneakers = READUINT8(save->p);
|
players[i].numweaksneakers = READUINT8(save->p);
|
||||||
players[i].floorboost = READUINT8(save->p);
|
players[i].floorboost = READUINT8(save->p);
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue