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

Merge branch 'fix-flame-scaling' into 'master'

Browse source 
Use scaled item distance for flameshield max bar

See merge request kart-krew-dev/ring-racers-internal!2660
This commit is contained in:
Oni VelocitOni 2025-07-02 02:36:57 +00:00
commit 5323b0f7ec
1 changed files with 3 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/k_kart.c
View file

@ -12767,25 +12767,12 @@ static INT32 K_FlameShieldMax(player_t *player)
UINT32 disttofinish = 0; UINT32 disttofinish = 0;
UINT32 distv = 1024; // Pre no-scams: 2048 UINT32 distv = 1024; // Pre no-scams: 2048
distv = distv * 16 / FLAMESHIELD_MAX; // Old distv was based on a 16-segment bar distv = distv * 16 / FLAMESHIELD_MAX; // Old distv was based on a 16-segment bar
UINT8 numplayers = 0; UINT32 scamradius = 1500*4; // How close is close enough that we shouldn't be allowed to scam 1st?
UINT32 scamradius = 1500; // How close is close enough that we shouldn't be allowed to scam 1st?
UINT8 i; UINT8 i;
if (gametyperules & GTR_CIRCUIT) disttofinish = K_GetItemRouletteDistance(player, 8);
{
for (i = 0; i < MAXPLAYERS; i++)
{
if (playeringame[i] && !players[i].spectator)
numplayers++;
if (players[i].position == 1)
disttofinish = players[i].distancetofinish;
}
}
disttofinish = player->distancetofinish - disttofinish; if (D_NumPlayersInRace() <= 1)
distv = FixedMul(distv, mapobjectscale);
if (numplayers <= 1)
{ {
return FLAMESHIELD_MAX; // max when alone, for testing return FLAMESHIELD_MAX; // max when alone, for testing
// and when in battle, for chaos // and when in battle, for chaos