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

Return earlier for multiple shields

Browse source
This commit is contained in:
TehRealSalt 2019-10-24 10:33:06 -04:00
parent 985b2ba8dd
commit e8c327e5bb
1 changed files with 6 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/k_kart.c
View file

@ -821,7 +821,6 @@ static INT32 K_KartGetItemOdds(UINT8 pos, SINT8 item, fixed_t mashed, boolean sp
INT32 newodds; INT32 newodds;
INT32 i; INT32 i;
UINT8 pingame = 0, pexiting = 0; UINT8 pingame = 0, pexiting = 0;
boolean shieldout[NUMKARTSHIELDS-1];
SINT8 first = -1, second = -1; SINT8 first = -1, second = -1;
INT32 secondist = 0; INT32 secondist = 0;
INT32 shieldtype = KSHIELD_NONE; INT32 shieldtype = KSHIELD_NONE;
@ -846,7 +845,7 @@ static INT32 K_KartGetItemOdds(UINT8 pos, SINT8 item, fixed_t mashed, boolean sp
// Base multiplication to ALL item odds to simulate fractional precision // Base multiplication to ALL item odds to simulate fractional precision
newodds *= 4; newodds *= 4;
memset(shieldout, false, sizeof(shieldout)); shieldtype = K_GetShieldFromItem(item);
for (i = 0; i < MAXPLAYERS; i++) for (i = 0; i < MAXPLAYERS; i++)
{ {
@ -859,9 +858,11 @@ static INT32 K_KartGetItemOdds(UINT8 pos, SINT8 item, fixed_t mashed, boolean sp
if (players[i].exiting) if (players[i].exiting)
pexiting++; pexiting++;
shieldtype = K_GetShieldFromItem(players[i].kartstuff[k_itemtype]); if (shieldtype != KSHIELD_NONE && shieldtype == K_GetShieldFromItem(players[i].kartstuff[k_itemtype]))
if (shieldtype != KSHIELD_NONE) {
shieldout[shieldtype-1] = true; // Don't allow more than one of each shield type at a time
return 0;
}
if (players[i].mo && G_RaceGametype()) if (players[i].mo && G_RaceGametype())
{ {
@ -882,11 +883,6 @@ static INT32 K_KartGetItemOdds(UINT8 pos, SINT8 item, fixed_t mashed, boolean sp
secondist = ((28 + (8-pingame)) * secondist) / 28; secondist = ((28 + (8-pingame)) * secondist) / 28;
} }
// Don't allow more than one of each shield type at a time
shieldtype = K_GetShieldFromItem(item);
if (shieldtype != KSHIELD_NONE && shieldout[shieldtype-1])
return 0;
// POWERITEMODDS handles all of the "frantic item" related functionality, for all of our powerful items. // POWERITEMODDS handles all of the "frantic item" related functionality, for all of our powerful items.
// First, it multiplies it by 2 if franticitems is true; easy-peasy. // First, it multiplies it by 2 if franticitems is true; easy-peasy.
// Next, it multiplies it again if it's in SPB mode and 2nd needs to apply pressure to 1st. // Next, it multiplies it again if it's in SPB mode and 2nd needs to apply pressure to 1st.