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 currentwaypoint

Browse source
This commit is contained in:
Sally Coolatta 2022-11-25 20:53:02 -05:00
parent 90e3d01395
commit b55c67c29d
4 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/d_player.h
View file

@ -413,6 +413,7 @@ typedef struct player_s
UINT8 oldposition; // Used for taunting when you pass someone UINT8 oldposition; // Used for taunting when you pass someone
UINT8 positiondelay; // Used for position number, so it can grow when passing UINT8 positiondelay; // Used for position number, so it can grow when passing
UINT32 distancetofinish; UINT32 distancetofinish;
waypoint_t *currentwaypoint;
waypoint_t *nextwaypoint; waypoint_t *nextwaypoint;
respawnvars_t respawn; // Respawn info respawnvars_t respawn; // Respawn info
tic_t airtime; // Keep track of how long you've been in the air tic_t airtime; // Keep track of how long you've been in the air

3
src/k_hud.c
View file

@ -4634,7 +4634,8 @@ static void K_DrawWaypointDebugger(void)
if (stplyr != &players[displayplayers[0]]) // only for p1 if (stplyr != &players[displayplayers[0]]) // only for p1
return; return;
V_DrawString(8, 166, 0, va("'Best' Waypoint ID: %d", K_GetWaypointID(stplyr->nextwaypoint))); V_DrawString(8, 156, 0, va("Current Waypoint ID: %d", K_GetWaypointID(stplyr->currentwaypoint)));
V_DrawString(8, 166, 0, va("Next Waypoint ID: %d", K_GetWaypointID(stplyr->nextwaypoint)));
V_DrawString(8, 176, 0, va("Finishline Distance: %d", stplyr->distancetofinish)); V_DrawString(8, 176, 0, va("Finishline Distance: %d", stplyr->distancetofinish));
if (numstarposts > 0) if (numstarposts > 0)

3
src/k_kart.c
View file

@ -8855,7 +8855,8 @@ static waypoint_t *K_GetPlayerNextWaypoint(player_t *player)
waypoint_t *waypoint = K_GetBestWaypointForMobj(player->mo); waypoint_t *waypoint = K_GetBestWaypointForMobj(player->mo);
boolean updaterespawn = false; boolean updaterespawn = false;
bestwaypoint = waypoint; // Our current waypoint.
player->currentwaypoint = bestwaypoint = waypoint;
// check the waypoint's location in relation to the player // check the waypoint's location in relation to the player
// If it's generally in front, it's fine, otherwise, use the best next/previous waypoint. // If it's generally in front, it's fine, otherwise, use the best next/previous waypoint.

9
src/p_saveg.c
View file

@ -4422,6 +4422,15 @@ static void P_RelinkPointers(void)
if (!P_SetTarget(&mobj->player->follower, P_FindNewPosition(temp))) if (!P_SetTarget(&mobj->player->follower, P_FindNewPosition(temp)))
CONS_Debug(DBG_GAMELOGIC, "follower not found on %d\n", mobj->type); CONS_Debug(DBG_GAMELOGIC, "follower not found on %d\n", mobj->type);
} }
if (mobj->player->currentwaypoint)
{
temp = (UINT32)(size_t)mobj->player->currentwaypoint;
mobj->player->currentwaypoint = K_GetWaypointFromIndex(temp);
if (mobj->player->currentwaypoint == NULL)
{
CONS_Debug(DBG_GAMELOGIC, "currentwaypoint not found on %d\n", mobj->type);
}
}
if (mobj->player->nextwaypoint) if (mobj->player->nextwaypoint)
{ {
temp = (UINT32)(size_t)mobj->player->nextwaypoint; temp = (UINT32)(size_t)mobj->player->nextwaypoint;