thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-05-10 19:01:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/master' into spindash

Browse source
This commit is contained in:
lachwright 2020-07-06 08:10:22 +08:00
commit d62f4d4d1a
3 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/k_kart.c
View file

@ -10096,8 +10096,9 @@ static void K_drawKartNameTags(void)
bary += (vid.height - (BASEVIDHEIGHT * vid.dupy)) / 2; bary += (vid.height - (BASEVIDHEIGHT * vid.dupy)) / 2;
} }
V_DrawFill(barx, bary, barw, (3 * vid.dupy), colormap[31]|V_NOSCALESTART); // Lat: 10/06/2020: colormap can be NULL on the frame you join a game, just arbitrarily use palette indexes 31 and 0 instead of whatever the colormap would give us instead to avoid crashes.
V_DrawFill(barx, bary + vid.dupy, barw, vid.dupy, colormap[0]|V_NOSCALESTART); V_DrawFill(barx, bary, barw, (3 * vid.dupy), (colormap ? colormap[31] : 31)|V_NOSCALESTART);
V_DrawFill(barx, bary + vid.dupy, barw, vid.dupy, (colormap ? colormap[0] : 0)|V_NOSCALESTART);
// END DRAWFILL DUMBNESS // END DRAWFILL DUMBNESS
// Draw the stem // Draw the stem

12
src/m_menu.c
View file

@ -5487,7 +5487,11 @@ static void DrawReplayHutReplayInfo(void)
} }
// Character face! // Character face!
if (W_CheckNumForName(skins[demolist[dir_on[menudepthleft]].standings[0].skin].facewant) != LUMPERROR)
// Lat: 08/06/2020: For some reason missing skins have their value set to 255 (don't even ask me why I didn't write this)
// and for an even STRANGER reason this passes the first check below, so we're going to make sure that the skin here ISN'T 255 before we do anything stupid.
if (demolist[dir_on[menudepthleft]].standings[0].skin != 0xFF && W_CheckNumForName(skins[demolist[dir_on[menudepthleft]].standings[0].skin].facewant) != LUMPERROR)
{ {
patch = facewantprefix[demolist[dir_on[menudepthleft]].standings[0].skin]; patch = facewantprefix[demolist[dir_on[menudepthleft]].standings[0].skin];
colormap = R_GetTranslationColormap( colormap = R_GetTranslationColormap(
@ -5685,7 +5689,11 @@ static void M_DrawReplayStartMenu(void)
V_DrawString(BASEVIDWIDTH-92, STARTY + i*20 + 9, V_SNAPTOTOP, va("%d", demolist[dir_on[menudepthleft]].standings[i].timeorscore)); V_DrawString(BASEVIDWIDTH-92, STARTY + i*20 + 9, V_SNAPTOTOP, va("%d", demolist[dir_on[menudepthleft]].standings[i].timeorscore));
// Character face! // Character face!
if (W_CheckNumForName(skins[demolist[dir_on[menudepthleft]].standings[i].skin].facerank) != LUMPERROR)
// Lat: 08/06/2020: For some reason missing skins have their value set to 255 (don't even ask me why I didn't write this)
// and for an even STRANGER reason this passes the first check below, so we're going to make sure that the skin here ISN'T 255 before we do anything stupid.
if (demolist[dir_on[menudepthleft]].standings[0].skin != 0xFF && W_CheckNumForName(skins[demolist[dir_on[menudepthleft]].standings[i].skin].facerank) != LUMPERROR)
{ {
patch = facerankprefix[demolist[dir_on[menudepthleft]].standings[i].skin]; patch = facerankprefix[demolist[dir_on[menudepthleft]].standings[i].skin];
colormap = R_GetTranslationColormap( colormap = R_GetTranslationColormap(

1
src/v_video.c
View file

@ -1909,7 +1909,6 @@ void V_DrawStringScaled(
if (!( flags & V_SNAPTOLEFT )) if (!( flags & V_SNAPTOLEFT ))
{ {
left = ( right - BASEVIDWIDTH )/ 2;/* left edge of drawable area */ left = ( right - BASEVIDWIDTH )/ 2;/* left edge of drawable area */
x = ( left << FRACBITS )+ x;
right -= left; right -= left;
} }
} }