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

Add respawn to fault start if available

Browse source 
Fixes KartKrew/Kart#187
This commit is contained in:
Eidolon 2024-02-24 21:05:49 -06:00
parent f4f7c5b1eb
commit ad75389225
1 changed files with 24 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/k_respawn.c
View file

@ -128,6 +128,8 @@ void K_DoFault(player_t *player)
--------------------------------------------------*/ --------------------------------------------------*/
void K_DoIngameRespawn(player_t *player) void K_DoIngameRespawn(player_t *player)
{ {
boolean faultstartfaulting = false;
if (!player->mo || P_MobjWasRemoved(player->mo)) if (!player->mo || P_MobjWasRemoved(player->mo))
{ {
return; return;
@ -149,7 +151,24 @@ void K_DoIngameRespawn(player_t *player)
{ {
const waypoint_t *finish = K_GetFinishLineWaypoint(); const waypoint_t *finish = K_GetFinishLineWaypoint();
if (!(mapheaderinfo[gamemap-1]->levelflags & LF_SECTIONRACE) && finish != NULL) if (numfaultstarts > 0 && faultstart)
{
subsector_t *subs;
if ((subs = R_PointInSubsectorOrNull(faultstart->x << FRACBITS, faultstart->y << FRACBITS)) != NULL)
{
faultstartfaulting = true;
player->respawn.wp = NULL;
player->respawn.flip = false;
player->respawn.pointx = faultstart->x << FRACBITS;
player->respawn.pointy = faultstart->y << FRACBITS;
player->respawn.pointz =
P_GetSectorFloorZAt(subs->sector, faultstart->x << FRACBITS, faultstart->y << FRACBITS)
+ (faultstart->z << FRACBITS)
+ K_RespawnOffset(player, player->respawn.flip);
player->respawn.pointangle = FixedAngle(faultstart->angle << FRACBITS);
}
}
else if (!(mapheaderinfo[gamemap-1]->levelflags & LF_SECTIONRACE) && finish != NULL)
player->respawn.wp = finish->prevwaypoints[0]; player->respawn.wp = finish->prevwaypoints[0];
K_DoFault(player); K_DoFault(player);
} }
@ -198,6 +217,10 @@ void K_DoIngameRespawn(player_t *player)
K_RespawnAtWaypoint(player, player->respawn.wp); K_RespawnAtWaypoint(player, player->respawn.wp);
} }
} }
else if (faultstartfaulting)
{
; // Do nothing, position was already set
}
else if ((gametyperules & GTR_CHECKPOINTS) else if ((gametyperules & GTR_CHECKPOINTS)
&& player->checkpointId && player->checkpointId
&& (checkpoint = Obj_FindCheckpoint(player->checkpointId)) && (checkpoint = Obj_FindCheckpoint(player->checkpointId))