diff options
| author | Fire-Head <Fire-Head@users.noreply.github.com> | 2021-01-05 02:17:18 +0100 |
|---|---|---|
| committer | Fire-Head <Fire-Head@users.noreply.github.com> | 2021-01-05 02:17:18 +0100 |
| commit | 11de714d9dbeabb59129d29acb9e433c538ba4ba (patch) | |
| tree | 99e973277c2986aceb45886684cee34191cfa6e4 /src/core/Radar.cpp | |
| parent | fix compiling (diff) | |
| download | re3-11de714d9dbeabb59129d29acb9e433c538ba4ba.tar re3-11de714d9dbeabb59129d29acb9e433c538ba4ba.tar.gz re3-11de714d9dbeabb59129d29acb9e433c538ba4ba.tar.bz2 re3-11de714d9dbeabb59129d29acb9e433c538ba4ba.tar.lz re3-11de714d9dbeabb59129d29acb9e433c538ba4ba.tar.xz re3-11de714d9dbeabb59129d29acb9e433c538ba4ba.tar.zst re3-11de714d9dbeabb59129d29acb9e433c538ba4ba.zip | |
Diffstat (limited to 'src/core/Radar.cpp')
| -rw-r--r-- | src/core/Radar.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/core/Radar.cpp b/src/core/Radar.cpp index 2b72e0fb..7af51929 100644 --- a/src/core/Radar.cpp +++ b/src/core/Radar.cpp @@ -1298,9 +1298,12 @@ void CRadar::TransformRadarPointToScreenSpace(CVector2D &out, const CVector2D &i #endif { #ifdef ASPECT_RATIO_SCALE -#define _RADAR_WIDTH ((CMenuManager::m_PrefsSpriteScalingMode==SCL_AUTO) ? (RADAR_HEIGHT) : (RADAR_WIDTH)) +// The values are from from an early screenshot taken before R* broke radar +#define _RADAR_WIDTH ((CDraw::ms_bFixRadar) ? (82.0f) : (RADAR_WIDTH)) +#define _RADAR_HEIGHT ((CDraw::ms_bFixRadar) ? (82.0f) : (RADAR_HEIGHT)) #else #define _RADAR_WIDTH RADAR_WIDTH +#define _RADAR_HEIGHT RADAR_HEIGHT #endif #ifdef FIX_BUGS @@ -1308,7 +1311,7 @@ void CRadar::TransformRadarPointToScreenSpace(CVector2D &out, const CVector2D &i #else out.x = (in.x + 1.0f) * 0.5f * SCREEN_SCALE_X(_RADAR_WIDTH) + RADAR_LEFT; #endif - out.y = (1.0f - in.y) * 0.5f * SCREEN_SCALE_Y(RADAR_HEIGHT) + SCREEN_SCALE_FROM_BOTTOM(RADAR_BOTTOM + RADAR_HEIGHT); + out.y = (1.0f - in.y) * 0.5f * SCREEN_SCALE_Y(_RADAR_HEIGHT) + SCREEN_SCALE_FROM_BOTTOM(RADAR_BOTTOM + _RADAR_HEIGHT); } } |