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

Merge branch 'pet-robo' of https://git.magicalgirl.moe/KartKrew/Kart into pet-robo

Browse source
This commit is contained in:
Sally Coolatta 2020-05-24 11:13:26 -04:00
commit 5e11068328
4 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/hu_stuff.c
View file

@ -3095,7 +3095,7 @@ static void HU_DrawRankings(void)
if (G_RaceGametype())
{
if (circuitmap)
tab[scorelines].count = players[i].laps+1;
tab[scorelines].count = players[i].laps;
else
tab[scorelines].count = players[i].realtime;
}

2
src/k_kart.c
View file

@ -9434,7 +9434,7 @@ void HU_DrawTabRankings(INT32 x, INT32 y, playersort_t *tab, INT32 scorelines, I
y2 = y;
if (playerconsole[tab[i].num] == 0 && server_lagless)
if (netgame && playerconsole[tab[i].num] == 0 && server_lagless && !players[tab[i].num].bot)
{
y2 = ( y - 4 );

3
src/p_spec.c
View file

@ -2209,7 +2209,8 @@ static void K_HandleLapDecrement(player_t *player)
void P_CrossSpecialLine(line_t *line, INT32 side, mobj_t *thing)
{
// only used for the players currently
if (thing && thing->player)
if (!(thing && thing->player && !thing->player->spectator && !(thing->player->pflags & PF_TIMEOVER)))
return;
{
player_t *player = thing->player;
switch (line->special)

6
src/y_inter.c
View file

@ -440,7 +440,7 @@ void Y_IntermissionDrawer(void)
int y2;
if (data.match.rankingsmode)
timeheader = "PWR.LV";
timeheader = (powertype != -1 ? "PWR.LV" : "RANK");
else
timeheader = ((intertype == int_race || (intertype == int_match && battlecapsules)) ? "TIME" : "SCORE");
@ -497,7 +497,7 @@ void Y_IntermissionDrawer(void)
y2 = y;
if (playerconsole[data.match.num[i]] == 0 && server_lagless)
if (netgame && playerconsole[data.match.num[i]] == 0 && server_lagless && !players[data.match.num[i]].bot)
{
static int alagles_timer = 0;
patch_t *alagles;
@ -533,7 +533,7 @@ void Y_IntermissionDrawer(void)
if (data.match.rankingsmode)
{
if (!clientpowerlevels[data.match.num[i]][powertype]) // No power level (splitscreen guests)
if (powertype != -1 && !clientpowerlevels[data.match.num[i]][powertype]) // No power level (splitscreen guests)
STRBUFCPY(strtime, "----");
else
{