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

Fix 4P position numbers > 9

Browse source
This commit is contained in:
Sally Coolatta 2023-09-08 18:43:18 -04:00
parent 96f7dcb5b8
commit e7642109b7
1 changed files with 19 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
src/k_hud.c
View file

@ -1961,13 +1961,13 @@ void K_drawKartTimestamp(tic_t drawtime, INT32 TX, INT32 TY, INT32 splitflags, U
static fixed_t K_DrawKartPositionNumPatch(UINT8 num, UINT8 *color, fixed_t x, fixed_t y, fixed_t scale, INT32 flags) static fixed_t K_DrawKartPositionNumPatch(UINT8 num, UINT8 *color, fixed_t x, fixed_t y, fixed_t scale, INT32 flags)
{ {
UINT8 splitIndex = (r_splitscreen > 0) ? 1 : 0; const UINT8 splitIndex = (r_splitscreen > 0) ? 1 : 0;
fixed_t w = FRACUNIT; fixed_t w = FRACUNIT;
fixed_t h = FRACUNIT; fixed_t h = FRACUNIT;
INT32 overlayFlags[2]; INT32 overlayFlags[2];
INT32 i; INT32 i;
if (num >= 10) if (num > 9)
{ {
return x; // invalid input return x; // invalid input
} }
@ -1986,10 +1986,7 @@ static fixed_t K_DrawKartPositionNumPatch(UINT8 num, UINT8 *color, fixed_t x, fi
w = SHORT(kp_positionnum[num][0][splitIndex]->width) * scale; w = SHORT(kp_positionnum[num][0][splitIndex]->width) * scale;
h = SHORT(kp_positionnum[num][0][splitIndex]->height) * scale; h = SHORT(kp_positionnum[num][0][splitIndex]->height) * scale;
if (flags & V_SNAPTORIGHT) x -= w;
{
x -= w;
}
if (flags & V_SNAPTOBOTTOM) if (flags & V_SNAPTOBOTTOM)
{ {
@ -2006,15 +2003,12 @@ static fixed_t K_DrawKartPositionNumPatch(UINT8 num, UINT8 *color, fixed_t x, fi
); );
} }
if (!(flags & V_SNAPTORIGHT)) x += 7 * scale; // push the tens place towards the ones place
{
x -= w;
}
return x; return x;
} }
static void K_DrawKartPositionNum(INT32 num) static void K_DrawKartPositionNum(UINT8 num)
{ {
const tic_t counter = (leveltime / 3); // Alternate colors every three frames const tic_t counter = (leveltime / 3); // Alternate colors every three frames
fixed_t scale = FRACUNIT; fixed_t scale = FRACUNIT;
@ -2092,6 +2086,8 @@ static void K_DrawKartPositionNum(INT32 num)
fx >>= 1; fx >>= 1;
fy >>= 1; fy >>= 1;
// We're putting it in the same corner as
// the rest of our HUD, so it needs raised.
fy -= (21 << FRACBITS); fy -= (21 << FRACBITS);
} }
@ -2130,30 +2126,28 @@ static void K_DrawKartPositionNum(INT32 num)
color = R_GetTranslationColormap(TC_DEFAULT, SKINCOLOR_POSNUM, GTC_CACHE); color = R_GetTranslationColormap(TC_DEFAULT, SKINCOLOR_POSNUM, GTC_CACHE);
} }
// Special case for 0 if ((fflags & V_SNAPTORIGHT) == 0 && num > 9)
if (num <= 0)
{ {
K_DrawKartPositionNumPatch( const UINT8 splitIndex = (r_splitscreen > 0) ? 1 : 0;
0, color, UINT8 adjustNum = num;
fx, fy, scale, V_SPLITSCREEN|fflags do
); {
fixed_t w = SHORT(kp_positionnum[adjustNum % 10][0][splitIndex]->width) * scale;
return; fx += w; // these should be the reverse of the
fx -= 7 * scale; // x offsets in K_DrawKartPositionNumPatch
adjustNum /= 10;
} while (adjustNum);
} }
// Draw the number // Draw the number
while (num) do
{ {
/*
*/
fx = K_DrawKartPositionNumPatch( fx = K_DrawKartPositionNumPatch(
(num % 10), color, (num % 10), color,
fx, fy, scale, V_SPLITSCREEN|fflags fx, fy, scale, V_SPLITSCREEN|fflags
); );
num /= 10; num /= 10;
} } while (num);
} }
static boolean K_drawKartPositionFaces(void) static boolean K_drawKartPositionFaces(void)