diff --git a/src/d_netcmd.c b/src/d_netcmd.c index 0e58998fa..eb79b950f 100644 --- a/src/d_netcmd.c +++ b/src/d_netcmd.c @@ -3076,7 +3076,7 @@ static void Command_RandomMap(void) } else { - newgametype = cv_newgametype.value; + newgametype = cv_dummygametype.value; // Changed from cv_newgametype to match newmenus newencoremode = false; newresetplayers = true; oldmapnum = -1; diff --git a/src/g_game.c b/src/g_game.c index 3121ab1d6..4d98256f1 100644 --- a/src/g_game.c +++ b/src/g_game.c @@ -1285,7 +1285,6 @@ static void weaponPrefChange4(void) // void G_DoLoadLevel(boolean resetplayer) { - INT32 i, j; boolean doAutomate = false; INT32 i; diff --git a/src/v_video.c b/src/v_video.c index bf93996bc..193339574 100644 --- a/src/v_video.c +++ b/src/v_video.c @@ -2582,6 +2582,8 @@ INT32 V_DrawPingNum(INT32 x, INT32 y, INT32 flags, INT32 num, const UINT8 *color } while (num); return x; +} + void V_DrawCenteredKartString(INT32 x, INT32 y, INT32 option, const char *string) { x -= V_KartStringWidth(string, option)/2; @@ -2705,28 +2707,6 @@ void V_DrawProfileNum(INT32 x, INT32 y, INT32 flags, UINT8 num) } while (--digits); } -// Draws a number using the PING font thingy. -// TODO: Merge number drawing functions into one with "font name" selection. - -void V_DrawPingNum(INT32 x, INT32 y, INT32 flags, INT32 num, const UINT8 *colormap) -{ - INT32 w = SHORT(fontv[PINGNUM_FONT].font[0]->width); // this SHOULD always be 5 but I guess custom graphics exist. - - if (flags & V_NOSCALESTART) - w *= vid.dupx; - - if (num < 0) - num = -num; - - // draw the number - do - { - x -= (w-1); // Oni wanted their outline to intersect. - V_DrawFixedPatch(x<