incidentalstoat/blankart
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Do not let distancetofinish change too drastically

Browse source 
- When updating nextwaypoint, check if distancetofinish
  jumps more than 32768 units (8192 in 1/4 scale maps)
- If it jumps this much, do not update the waypoints
- This prevents nextwaypoint from skipping ahead in a map
  where waypoints from later in the course overlap
  waypoints from earlier
This commit is contained in:
James R 2024-02-28 18:10:46 -08:00 committed by NepDisk
parent 82a636e0e8
commit fa09c1beea
1 changed files with 21 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/k_kart.c
View file

@ -7501,6 +7501,11 @@ static void K_UpdateDistanceFromFinishLine(player_t *const player)
}
}
static UINT32 u32_delta(UINT32 x, UINT32 y)
{
return x > y ? x - y : y - x;
}
/*--------------------------------------------------
static void K_UpdatePlayerWaypoints(player_t *const player)
@ -7514,6 +7519,9 @@ static void K_UpdateDistanceFromFinishLine(player_t *const player)
--------------------------------------------------*/
static void K_UpdatePlayerWaypoints(player_t *const player)
{
const UINT32 distance_threshold = FixedMul(32768, mapobjectscale);
waypoint_t *const old_currentwaypoint = player->currentwaypoint;
waypoint_t *const old_nextwaypoint = player->nextwaypoint;
boolean updaterespawn = K_SetPlayerNextWaypoint(player);
@ -7521,6 +7529,19 @@ static void K_UpdatePlayerWaypoints(player_t *const player)
// Update prev value (used for grief prevention code)
K_UpdateDistanceFromFinishLine(player);
// Respawning should be a full reset.
UINT32 delta = u32_delta(player->distancetofinish, player->distancetofinishprev);
if (player->respawn.state == RESPAWNST_NONE && delta > distance_threshold)
{
CONS_Debug(DBG_GAMELOGIC, "Player %s: waypoint ID %d too far away (%u > %u)\n",
sizeu1(player - players), K_GetWaypointID(player->nextwaypoint), delta, distance_threshold);
// Distance jump is too great, keep the old waypoints and recalculate distance.
player->currentwaypoint = old_currentwaypoint;
player->nextwaypoint = old_nextwaypoint;
K_UpdateDistanceFromFinishLine(player);
}
// Respawn point should only be updated when we're going to a nextwaypoint
if ((updaterespawn) &&
(!player->respawn) &&