fix radarmap drawing in tactical inventory view (#177)

720p resolution with 10 man squads had radarscreen rendered in a wrong location
This commit is contained in:
Asdow
2023-07-14 07:56:27 +03:00
committed by GitHub
parent 1150fb5352
commit c036160959
+5 -4
View File
@@ -83,14 +83,15 @@ void InitRadarScreenCoords( )
RADAR_WINDOW_STRAT_X = UI_BOTTOM_X + 1182; RADAR_WINDOW_STRAT_X = UI_BOTTOM_X + 1182;
RADAR_WINDOW_STRAT_Y = UI_BOTTOM_Y + 9; RADAR_WINDOW_STRAT_Y = UI_BOTTOM_Y + 9;
RADAR_WINDOW_TM_X = xResOffset + (xResSize - 97) + 223; RADAR_WINDOW_TM_X = xResOffset + (xResSize - 97) + 223;
RADAR_WINDOW_SM_X = xResOffset + (xResSize - 97);
} }
else else
{ {
RADAR_WINDOW_STRAT_X = xResOffset + (xResSize - 97); RADAR_WINDOW_STRAT_X = xResOffset + (xResSize - 97);
RADAR_WINDOW_STRAT_Y = (SCREEN_HEIGHT - 107); RADAR_WINDOW_STRAT_Y = (SCREEN_HEIGHT - 107);
RADAR_WINDOW_TM_X = xResOffset + (xResSize - 97); RADAR_WINDOW_TM_X = xResOffset + (xResSize - 97);
RADAR_WINDOW_SM_X = xResOffset + (xResSize - 97);
} }
RADAR_WINDOW_SM_X = xResOffset + (xResSize - 97);
RADAR_WINDOW_TM_Y = (INTERFACE_START_Y + 13); RADAR_WINDOW_TM_Y = (INTERFACE_START_Y + 13);
RADAR_WINDOW_SM_Y = ((UsingNewInventorySystem() == false)) ? (INV_INTERFACE_START_Y + 33) : (INV_INTERFACE_START_Y + 116); RADAR_WINDOW_SM_Y = ((UsingNewInventorySystem() == false)) ? (INV_INTERFACE_START_Y + 33) : (INV_INTERFACE_START_Y + 116);
@@ -436,8 +437,8 @@ void RenderRadarScreen( )
sWidth = ( RADAR_WINDOW_WIDTH ); sWidth = ( RADAR_WINDOW_WIDTH );
sHeight = ( RADAR_WINDOW_HEIGHT ); sHeight = ( RADAR_WINDOW_HEIGHT );
sX = RADAR_WINDOW_TM_X; sX = gsRadarX;
sY = gsRadarY; sY = gsRadarY;
sRadarTLX = (INT16)( ( sTopLeftWorldX * gdScaleX ) - sRadarCX + sX + ( sWidth /2 ) ); sRadarTLX = (INT16)( ( sTopLeftWorldX * gdScaleX ) - sRadarCX + sX + ( sWidth /2 ) );
@@ -602,7 +603,7 @@ void RenderRadarScreen( )
} }
// Add starting relative to interface // Add starting relative to interface
sXSoldRadar += RADAR_WINDOW_TM_X; sXSoldRadar += gsRadarX;
sYSoldRadar += gsRadarY; sYSoldRadar += gsRadarY;
if(gbPixelDepth==16) if(gbPixelDepth==16)