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

2 more tweaks

Browse source 
- Ring pickup is disabled while SPB is locked onto you (HUD animation to signify this is not implemented yet)
- Ring afterimages only spawn while in the air, to reduce lag
This commit is contained in:
TehRealSalt 2019-04-09 12:25:11 -04:00
parent 5228f85fee
commit 583b3bb4a7
3 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/k_kart.c
View file

@ -863,7 +863,7 @@ static INT32 K_KartGetItemOdds(UINT8 pos, SINT8 item, fixed_t mashed, boolean sp
POWERITEMODDS(newodds); POWERITEMODDS(newodds);
break; break;
case KITEM_THUNDERSHIELD: case KITEM_THUNDERSHIELD:
if (thunderisout) if (thunderisout || spbplace != -1)
newodds = 0; newodds = 0;
else else
POWERITEMODDS(newodds); POWERITEMODDS(newodds);

3
src/p_enemy.c
View file

@ -3670,7 +3670,8 @@ void A_AttractChase(mobj_t *actor)
actor->momy = FixedMul(FixedDiv(actor->momy, oldspeed), newspeed); actor->momy = FixedMul(FixedDiv(actor->momy, oldspeed), newspeed);
} }
P_SpawnGhostMobj(actor)->tics = 3; if (!P_IsObjectOnGround(actor))
P_SpawnGhostMobj(actor)->tics = 3;
} }
if (actor->tracer && actor->tracer->player && actor->tracer->health if (actor->tracer && actor->tracer->player && actor->tracer->health

4
src/p_inter.c
View file

@ -690,6 +690,10 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck)
if (special->extravalue1) if (special->extravalue1)
return; return;
// No picking up rings while SPB is targetting you
if (player->kartstuff[k_position] == spbplace)
return;
// Don't immediately pick up spilled rings // Don't immediately pick up spilled rings
if (special->threshold > 0 if (special->threshold > 0
|| player->kartstuff[k_squishedtimer] || player->kartstuff[k_squishedtimer]