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

Just bringing it up to date w/ master

Browse source 
Got it to compile after some cleaning.
This commit is contained in:
VelocitOni 2022-09-13 19:17:39 -04:00
parent 8a5707ad83
commit 92cfb5a677
4 changed files with 3 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/d_netcmd.c
View file

@ -3076,7 +3076,7 @@ static void Command_RandomMap(void)
} }
else else
{ {
newgametype = cv_newgametype.value; newgametype = cv_dummygametype.value; // Changed from cv_newgametype to match newmenus
newencoremode = false; newencoremode = false;
newresetplayers = true; newresetplayers = true;
oldmapnum = -1; oldmapnum = -1;

1
src/g_game.c
View file

@ -1285,7 +1285,6 @@ static void weaponPrefChange4(void)
// //
void G_DoLoadLevel(boolean resetplayer) void G_DoLoadLevel(boolean resetplayer)
{ {
INT32 i, j;
boolean doAutomate = false; boolean doAutomate = false;
INT32 i; INT32 i;

24
src/v_video.c
View file

@ -2582,6 +2582,8 @@ INT32 V_DrawPingNum(INT32 x, INT32 y, INT32 flags, INT32 num, const UINT8 *color
} while (num); } while (num);
return x; return x;
}
void V_DrawCenteredKartString(INT32 x, INT32 y, INT32 option, const char *string) void V_DrawCenteredKartString(INT32 x, INT32 y, INT32 option, const char *string)
{ {
x -= V_KartStringWidth(string, option)/2; x -= V_KartStringWidth(string, option)/2;
@ -2705,28 +2707,6 @@ void V_DrawProfileNum(INT32 x, INT32 y, INT32 flags, UINT8 num)
} while (--digits); } 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<<FRACBITS, y<<FRACBITS, FRACUNIT, flags, fontv[PINGNUM_FONT].font[num%10], colormap);
num /= 10;
} while (num);
}
// Find max height of the string // Find max height of the string
// //
INT32 V_LevelNameHeight(const char *string) INT32 V_LevelNameHeight(const char *string)

7
src/y_inter.c
View file

@ -884,13 +884,6 @@ void Y_StartIntermission(void)
K_CashInPowerLevels(); K_CashInPowerLevels();
} }
//if (intertype == int_race || intertype == int_battle)
{
//bgtile = W_CachePatchName("SRB2BACK", PU_STATIC);
usetile = useinterpic = false;
usebuffer = true;
}
Automate_Run(AEV_INTERMISSIONSTART); Automate_Run(AEV_INTERMISSIONSTART);
bgpatch = W_CachePatchName("MENUBG", PU_STATIC); bgpatch = W_CachePatchName("MENUBG", PU_STATIC);
widebgpatch = W_CachePatchName("WEIRDRES", PU_STATIC); widebgpatch = W_CachePatchName("WEIRDRES", PU_STATIC);