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

Sealed Star Emeralds retarget when their carrier dies

Browse source
This commit is contained in:
AJ Martinez 2024-03-29 18:11:05 -07:00
parent 20d6dcda88
commit 162591efdb
1 changed files with 28 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/objects/emerald.c
View file

@ -17,6 +17,7 @@
#include "../r_main.h" #include "../r_main.h"
#include "../s_sound.h" #include "../s_sound.h"
#include "../tables.h" #include "../tables.h"
#include "../g_game.h"
#define emerald_type(o) ((o)->extravalue1) #define emerald_type(o) ((o)->extravalue1)
#define emerald_anim_start(o) ((o)->movedir) #define emerald_anim_start(o) ((o)->movedir)
@ -126,6 +127,33 @@ static void Obj_EmeraldOrbitPlayer(mobj_t *emerald)
fixed_t x = FixedMul(r, FCOS(emerald->angle)); fixed_t x = FixedMul(r, FCOS(emerald->angle));
fixed_t y = FixedMul(r, FSIN(emerald->angle)); fixed_t y = FixedMul(r, FSIN(emerald->angle));
// Multiplayer Sealed Stars can become unwinnable if someone deathpits with the emerald. Find a player to retarget!
if ((gametyperules & GTR_CATCHER) && emerald_orbit(emerald)->player && (emerald_orbit(emerald)->player->pflags & PF_NOCONTEST))
{
player_t *bestplayer = emerald_orbit(emerald)->player;
for (int i = 0; i < MAXPLAYERS; i++)
{
if (!playeringame[i])
continue;
if (players[i].spectator)
continue;
if (players[i].pflags & PF_NOCONTEST)
continue;
if (!(players[i].mo && !P_MobjWasRemoved(players[i].mo)))
continue;
if ((bestplayer->pflags & PF_NOCONTEST) || (players[i].distancetofinish < bestplayer->distancetofinish))
bestplayer = &players[i];
}
if (!(bestplayer->pflags & PF_NOCONTEST))
{
P_MoveOrigin(emerald, bestplayer->mo->x, bestplayer->mo->y, bestplayer->mo->z);
Obj_BeginEmeraldOrbit(emerald, bestplayer->mo, 100 * mapobjectscale, 64, 0);
return;
}
}
P_MoveOrigin( P_MoveOrigin(
emerald, emerald,
emerald_orbit(emerald)->x + x, emerald_orbit(emerald)->x + x,