thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-04-27 12:31:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'eaturnongreens' into 'master'

Browse source 
Eat your non-greens (resolves #221)

Closes #221

See merge request KartKrew/Kart!549
This commit is contained in:
James R 2022-02-17 05:05:52 +00:00
commit ea9b1daeb9
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/k_hud.c
View file

@ -865,8 +865,8 @@ void K_ObjectTracking(trackingResult_t *result, vector3_t *point, UINT8 cameraNu
// Calculate screen size adjustments. // Calculate screen size adjustments.
// TODO: Anyone want to make this support non-green resolutions somehow? :V // TODO: Anyone want to make this support non-green resolutions somehow? :V
screenWidth = BASEVIDWIDTH; screenWidth = vid.width/vid.dupx;
screenHeight = BASEVIDHEIGHT; screenHeight = vid.height/vid.dupy;
if (r_splitscreen >= 2) if (r_splitscreen >= 2)
{ {
@ -925,6 +925,10 @@ void K_ObjectTracking(trackingResult_t *result, vector3_t *point, UINT8 cameraNu
result->onScreen = false; result->onScreen = false;
} }
// adjust to non-green-resolution screen coordinates
result->x -= ((vid.width/vid.dupx) - BASEVIDWIDTH)<<(FRACBITS-((r_splitscreen >= 2) ? 2 : 1));
result->y -= ((vid.height/vid.dupy) - BASEVIDHEIGHT)<<(FRACBITS-((r_splitscreen >= 1) ? 2 : 1));
return; return;
#undef NEWTAN #undef NEWTAN

3
src/v_video.c
View file

@ -997,7 +997,8 @@ void V_DrawFillConsoleMap(INT32 x, INT32 y, INT32 w, INT32 h, INT32 c)
w *= dupx; w *= dupx;
h *= dupy; h *= dupy;
// adjustxy // Center it if necessary
K_AdjustXYWithSnap(&x, &y, c, dupx, dupy);
} }
if (x >= vid.width || y >= vid.height) if (x >= vid.width || y >= vid.height)