diff options
| author | Fire-Head <Fire-Head@users.noreply.github.com> | 2021-01-08 17:31:48 +0100 |
|---|---|---|
| committer | Fire-Head <Fire-Head@users.noreply.github.com> | 2021-01-08 17:31:48 +0100 |
| commit | 368d2f3279b474056e888dcccea234f32614b506 (patch) | |
| tree | 6ab081b692b3a7e9185076049d4f0655565235e8 /src/core/Radar.cpp | |
| parent | upd (diff) | |
| download | re3-368d2f3279b474056e888dcccea234f32614b506.tar re3-368d2f3279b474056e888dcccea234f32614b506.tar.gz re3-368d2f3279b474056e888dcccea234f32614b506.tar.bz2 re3-368d2f3279b474056e888dcccea234f32614b506.tar.lz re3-368d2f3279b474056e888dcccea234f32614b506.tar.xz re3-368d2f3279b474056e888dcccea234f32614b506.tar.zst re3-368d2f3279b474056e888dcccea234f32614b506.zip | |
Diffstat (limited to 'src/core/Radar.cpp')
| -rw-r--r-- | src/core/Radar.cpp | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/src/core/Radar.cpp b/src/core/Radar.cpp index f8227bf7..816da6b9 100644 --- a/src/core/Radar.cpp +++ b/src/core/Radar.cpp @@ -1297,21 +1297,12 @@ void CRadar::TransformRadarPointToScreenSpace(CVector2D &out, const CVector2D &i } else #endif { -#ifdef ASPECT_RATIO_SCALE -// The values are 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 - out.x = (in.x + 1.0f) * 0.5f * SCREEN_SCALE_X(_RADAR_WIDTH) + SCREEN_SCALE_X(RADAR_LEFT); + out.x = (in.x + 1.0f) * 0.5f * SCREEN_SCALE_X(RADAR_WIDTH) + SCREEN_SCALE_X(RADAR_LEFT); #else - out.x = (in.x + 1.0f) * 0.5f * SCREEN_SCALE_X(_RADAR_WIDTH) + RADAR_LEFT; + 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); } } |