diff --git a/src/hu_stuff.c b/src/hu_stuff.c index 106aec030..8ffcc3743 100644 --- a/src/hu_stuff.c +++ b/src/hu_stuff.c @@ -2432,7 +2432,7 @@ void HU_drawPlayerPing(INT32 x, INT32 y, INT32 pnum, INT32 flags) if (measureid == 1) V_DrawScaledPatch(x+11 - pingmeasure[measureid]->width, y+9, flags, pingmeasure[measureid]); - + if (cv_pingicon.value) V_DrawScaledPatch(x+2, y, flags, pinggfx[gfxnum]); diff --git a/src/p_setup.c b/src/p_setup.c index 967c964f3..2af8e37a9 100644 --- a/src/p_setup.c +++ b/src/p_setup.c @@ -2264,21 +2264,13 @@ static void P_LevelInitStuff(boolean reloadinggamestate) players[i].realtime = racecountdown = exitcountdown = 0; -<<<<<<< HEAD -<<<<<<< HEAD for (INT32 j = 0; j < LAP__MAX; j++) { players[i].laptime[j] = 0; } players[i].driftsparkGrowTimer = 0; -======= - // Neptune - players[i].spinoutrot = 0; ->>>>>>> 052dcb263 (Add a cvar for minimap icon spinouts) -======= ->>>>>>> 432dcd3a3 (Refactor to prevent desynchs) players[i].gotcontinue = false; players[i].xtralife = players[i].deadtimer = players[i].numboxes = players[i].totalring = players[i].laps = 0;