From c03616095910138cb5f00f74b9ef5fb9f0b8ccdd Mon Sep 17 00:00:00 2001 From: Asdow <20314541+Asdow@users.noreply.github.com> Date: Fri, 14 Jul 2023 07:56:27 +0300 Subject: [PATCH] fix radarmap drawing in tactical inventory view (#177) 720p resolution with 10 man squads had radarscreen rendered in a wrong location --- TileEngine/Radar Screen.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/TileEngine/Radar Screen.cpp b/TileEngine/Radar Screen.cpp index b27ce927..6146818e 100644 --- a/TileEngine/Radar Screen.cpp +++ b/TileEngine/Radar Screen.cpp @@ -83,14 +83,15 @@ void InitRadarScreenCoords( ) RADAR_WINDOW_STRAT_X = UI_BOTTOM_X + 1182; RADAR_WINDOW_STRAT_Y = UI_BOTTOM_Y + 9; RADAR_WINDOW_TM_X = xResOffset + (xResSize - 97) + 223; + RADAR_WINDOW_SM_X = xResOffset + (xResSize - 97); } else { RADAR_WINDOW_STRAT_X = xResOffset + (xResSize - 97); RADAR_WINDOW_STRAT_Y = (SCREEN_HEIGHT - 107); 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_SM_Y = ((UsingNewInventorySystem() == false)) ? (INV_INTERFACE_START_Y + 33) : (INV_INTERFACE_START_Y + 116); @@ -436,8 +437,8 @@ void RenderRadarScreen( ) sWidth = ( RADAR_WINDOW_WIDTH ); sHeight = ( RADAR_WINDOW_HEIGHT ); - sX = RADAR_WINDOW_TM_X; - sY = gsRadarY; + sX = gsRadarX; + sY = gsRadarY; sRadarTLX = (INT16)( ( sTopLeftWorldX * gdScaleX ) - sRadarCX + sX + ( sWidth /2 ) ); @@ -602,7 +603,7 @@ void RenderRadarScreen( ) } // Add starting relative to interface - sXSoldRadar += RADAR_WINDOW_TM_X; + sXSoldRadar += gsRadarX; sYSoldRadar += gsRadarY; if(gbPixelDepth==16)