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

Merge branch 'ring-tweaks' into 'master'

Browse source 
Ring tweaks

See merge request KartKrew/Kart!180
This commit is contained in:
Sal 2019-10-02 11:39:31 -04:00
commit d5bb5c3a25
2 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/k_kart.c
View file

@ -5953,7 +5953,7 @@ void K_MoveKartPlayer(player_t *player, boolean onground)
&& NO_HYUDORO && !(HOLDING_ITEM && NO_HYUDORO && !(HOLDING_ITEM
|| player->kartstuff[k_itemamount] || player->kartstuff[k_itemamount]
|| player->kartstuff[k_itemroulette] || player->kartstuff[k_itemroulette]
|| player->kartstuff[k_growshrinktimer] // Being disabled during Shrink was unintended but people seemed to be okay with it sooo... || player->kartstuff[k_growshrinktimer] > 0
|| player->kartstuff[k_rocketsneakertimer] || player->kartstuff[k_rocketsneakertimer]
|| player->kartstuff[k_eggmanexplode])) || player->kartstuff[k_eggmanexplode]))
player->kartstuff[k_userings] = 1; player->kartstuff[k_userings] = 1;

8
src/p_mobj.c
View file

@ -11021,8 +11021,16 @@ void P_RespawnSpecials(void)
if (pcount == 1) // No respawn when alone if (pcount == 1) // No respawn when alone
return; return;
else if (pcount > 1) else if (pcount > 1)
{
time = (180 - (pcount * 10))*TICRATE; time = (180 - (pcount * 10))*TICRATE;
// If the map is longer or shorter than 3 laps, then adjust ring respawn to account for this.
// 5 lap courses would have more retreaded ground, while 2 lap courses would have less.
if ((mapheaderinfo[gamemap-1]->numlaps != 3)
&& !(mapheaderinfo[gamemap-1]->levelflags & LF_SECTIONRACE))
time = (time * 3) / max(1, mapheaderinfo[gamemap-1]->numlaps);
}
// only respawn items when cv_itemrespawn is on // only respawn items when cv_itemrespawn is on
//if (!cv_itemrespawn.value) // TODO: remove this cvar //if (!cv_itemrespawn.value) // TODO: remove this cvar
//return; //return;