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

Merge branch 'challenge-gl-fix' into 'master'

Browse source 
Fix Challenge Board in GL non-green res

See merge request KartKrew/Kart!2309
This commit is contained in:
Sal 2024-04-26 18:15:27 +00:00
commit 93098540ce
1 changed files with 12 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/hardware/hw_draw.c
View file

@ -641,13 +641,18 @@ void HWR_DrawFadeFill(INT32 x, INT32 y, INT32 w, INT32 h, INT32 color, UINT16 ac
if (!(color & V_NOSCALESTART)) if (!(color & V_NOSCALESTART))
{ {
float dupx = (float)vid.dupx, dupy = (float)vid.dupy; float dupx = (float)vid.dupx, dupy = (float)vid.dupy;
INT32 intx, inty;
fx *= dupx; fx *= dupx;
fy *= dupy; fy *= dupy;
fw *= dupx; fw *= dupx;
fh *= dupy; fh *= dupy;
// adjustxy intx = (INT32)fx;
inty = (INT32)fy;
V_AdjustXYWithSnap(&intx, &inty, color, dupx, dupy);
fx = (float)intx;
fy = (float)inty;
} }
if (fx >= vid.width || fy >= vid.height) if (fx >= vid.width || fy >= vid.height)
@ -984,27 +989,18 @@ void HWR_DrawDiag(INT32 x, INT32 y, INT32 wh, INT32 color)
if (!(color & V_NOSCALESTART)) if (!(color & V_NOSCALESTART))
{ {
float dupx = (float)vid.dupx, dupy = (float)vid.dupy; float dupx = (float)vid.dupx, dupy = (float)vid.dupy;
INT32 intx, inty;
fx *= dupx; fx *= dupx;
fy *= dupy; fy *= dupy;
fw *= dupx; fw *= dupx;
fh *= dupy; fh *= dupy;
if (fabsf((float)vid.width - ((float)BASEVIDWIDTH * dupx)) > 1.0E-36f) intx = (INT32)fx;
{ inty = (INT32)fy;
if (color & V_SNAPTORIGHT) V_AdjustXYWithSnap(&intx, &inty, color, dupx, dupy);
fx += ((float)vid.width - ((float)BASEVIDWIDTH * dupx)); fx = (float)intx;
else if (!(color & V_SNAPTOLEFT)) fy = (float)inty;
fx += ((float)vid.width - ((float)BASEVIDWIDTH * dupx)) / 2;
}
if (fabsf((float)vid.height - ((float)BASEVIDHEIGHT * dupy)) > 1.0E-36f)
{
// same thing here
if (color & V_SNAPTOBOTTOM)
fy += ((float)vid.height - ((float)BASEVIDHEIGHT * dupy));
else if (!(color & V_SNAPTOTOP))
fy += ((float)vid.height - ((float)BASEVIDHEIGHT * dupy)) / 2;
}
} }
if (fx >= vid.width || fy >= vid.height) if (fx >= vid.width || fy >= vid.height)