Merge branch 'ring-pickup-delete' into 'master'

Ring Pickup Delete (Resolves #1227 but needs TA verification)

Closes #1227

See merge request KartKrew/Kart!2208
This commit is contained in:
James R. 2024-04-02 03:50:26 +00:00
commit 699439d3b7

View file

@ -685,6 +685,11 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck)
special->extravalue1 = 1; // Ring collect animation timer
special->angle = R_PointToAngle2(toucher->x, toucher->y, special->x, special->y); // animation angle
P_SetTarget(&special->target, toucher); // toucher for thinker
// For MT_FLINGRING - don't delete yourself mid-pickup.
special->renderflags &= ~RF_DONTDRAW;
special->fuse = 0;
player->pickuprings++;
return;