Very minor fix to WRONG WAY

More opaque waypoint markers for kartdebugwaypoints
Looks like whitespace got murdered in k_kart.c again
This commit is contained in:
Sryder 2020-03-21 23:24:04 +00:00
parent 738d1f1940
commit e874af3e43
2 changed files with 355 additions and 343 deletions

View file

@ -6012,8 +6012,14 @@ static waypoint_t *K_GetPlayerNextWaypoint(player_t *player)
{ {
bestwaypoint = waypoint->nextwaypoints[i]; bestwaypoint = waypoint->nextwaypoints[i];
nextbestdelta = angledelta; if (angledelta < nextbestdelta)
nextbestmomdelta = momdelta; {
nextbestdelta = angledelta;
}
if (momdelta < nextbestmomdelta)
{
nextbestmomdelta = momdelta;
}
// Remove wrong way flag if we're using nextwaypoints // Remove wrong way flag if we're using nextwaypoints
player->kartstuff[k_wrongway] = 0; player->kartstuff[k_wrongway] = 0;
@ -6049,7 +6055,7 @@ static waypoint_t *K_GetPlayerNextWaypoint(player_t *player)
nextbestdelta = angledelta; nextbestdelta = angledelta;
nextbestmomdelta = momdelta; nextbestmomdelta = momdelta;
// Ser wrong way flag if we're using prevwaypoints // Set wrong way flag if we're using prevwaypoints
player->kartstuff[k_wrongway] = 1; player->kartstuff[k_wrongway] = 1;
updaterespawn = false; updaterespawn = false;
} }
@ -10619,6 +10625,7 @@ static void K_DrawWaypointDebugger(void)
{ {
if ((cv_kartdebugwaypoints.value != 0) && (stplyr == &players[displayplayers[0]])) if ((cv_kartdebugwaypoints.value != 0) && (stplyr == &players[displayplayers[0]]))
{ {
V_DrawString(8, 166, 0, va("'Best' 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));
} }
} }
@ -10823,8 +10830,10 @@ void K_drawKartHUD(void)
K_drawKartFreePlay(leveltime); K_drawKartFreePlay(leveltime);
} }
if (stplyr->kartstuff[k_wrongway] && ((leveltime / 8) & 1)) if (splitscreen == 0 && stplyr->kartstuff[k_wrongway] && ((leveltime / 8) & 1))
{
V_DrawCenteredString(BASEVIDWIDTH>>1, 176, V_REDMAP|V_SNAPTOBOTTOM, "WRONG WAY"); V_DrawCenteredString(BASEVIDWIDTH>>1, 176, V_REDMAP|V_SNAPTOBOTTOM, "WRONG WAY");
}
if (cv_kartdebugdistribution.value) if (cv_kartdebugdistribution.value)
K_drawDistributionDebugger(); K_drawDistributionDebugger();

View file

@ -461,6 +461,9 @@ void K_DebugWaypointsVisualise(void)
debugmobj = P_SpawnMobj(waypointmobj->x, waypointmobj->y, waypointmobj->z, MT_SPARK); debugmobj = P_SpawnMobj(waypointmobj->x, waypointmobj->y, waypointmobj->z, MT_SPARK);
P_SetMobjState(debugmobj, S_THOK); P_SetMobjState(debugmobj, S_THOK);
debugmobj->frame &= ~FF_TRANSMASK;
debugmobj->frame |= FF_TRANS20;
// There's a waypoint setup for this mobj! So draw that it's a valid waypoint and draw lines to its connections // There's a waypoint setup for this mobj! So draw that it's a valid waypoint and draw lines to its connections
if (waypoint != NULL) if (waypoint != NULL)
{ {