thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-04-26 20:11:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Don't drop emeralds unless it's a new hit

Browse source
This commit is contained in:
AJ Martinez 2023-05-25 22:49:14 -07:00
parent d9dda87586
commit 20f57d7efa
4 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/d_player.h
View file

@ -746,6 +746,8 @@ struct player_t
UINT8 instaShieldCooldown; UINT8 instaShieldCooldown;
UINT8 guardCooldown; UINT8 guardCooldown;
UINT16 incontrol;
uint8_t public_key[PUBKEYLENGTH]; uint8_t public_key[PUBKEYLENGTH];
#ifdef HWRENDER #ifdef HWRENDER

3
src/k_battle.c
View file

@ -265,6 +265,9 @@ void K_DropEmeraldsFromPlayer(player_t *player, UINT32 emeraldType)
UINT8 i; UINT8 i;
SINT8 flip = P_MobjFlip(player->mo); SINT8 flip = P_MobjFlip(player->mo);
if (player->incontrol < TICRATE)
return;
for (i = 0; i < 14; i++) for (i = 0; i < 14; i++)
{ {
UINT32 emeraldFlag = (1 << i); UINT32 emeraldFlag = (1 << i);

5
src/k_kart.c
View file

@ -8031,6 +8031,11 @@ void K_KartPlayerThink(player_t *player, ticcmd_t *cmd)
if (player->tiregrease) if (player->tiregrease)
player->tiregrease--; player->tiregrease--;
if (player->spinouttimer || player->tumbleBounces)
player->incontrol = 0;
else
player->incontrol++;
if (player->tumbleBounces > 0) if (player->tumbleBounces > 0)
{ {
K_HandleTumbleSound(player); K_HandleTumbleSound(player);

2
src/p_saveg.c
View file

@ -428,6 +428,7 @@ static void P_NetArchivePlayers(savebuffer_t *save)
WRITEUINT8(save->p, players[i].instaShieldCooldown); WRITEUINT8(save->p, players[i].instaShieldCooldown);
WRITEUINT8(save->p, players[i].guardCooldown); WRITEUINT8(save->p, players[i].guardCooldown);
WRITEUINT16(save->p, players[i].incontrol);
// respawnvars_t // respawnvars_t
WRITEUINT8(save->p, players[i].respawn.state); WRITEUINT8(save->p, players[i].respawn.state);
@ -819,6 +820,7 @@ static void P_NetUnArchivePlayers(savebuffer_t *save)
players[i].instaShieldCooldown = READUINT8(save->p); players[i].instaShieldCooldown = READUINT8(save->p);
players[i].guardCooldown = READUINT8(save->p); players[i].guardCooldown = READUINT8(save->p);
players[i].incontrol = READUINT16(save->p);
// respawnvars_t // respawnvars_t
players[i].respawn.state = READUINT8(save->p); players[i].respawn.state = READUINT8(save->p);