diff options
| author | Fire-Head <Fire-Head@users.noreply.github.com> | 2020-12-29 18:24:16 +0100 |
|---|---|---|
| committer | Fire-Head <Fire-Head@users.noreply.github.com> | 2020-12-29 18:24:16 +0100 |
| commit | 224e805fe4e7a4d5366b228072834674f77fa0ba (patch) | |
| tree | e28b27bea8a0b8c5d78b1a67231713c58f430e9f /src/core/Radar.cpp | |
| parent | Merge branch 'master' of github.com:GTAmodding/re3 (diff) | |
| download | re3-224e805fe4e7a4d5366b228072834674f77fa0ba.tar re3-224e805fe4e7a4d5366b228072834674f77fa0ba.tar.gz re3-224e805fe4e7a4d5366b228072834674f77fa0ba.tar.bz2 re3-224e805fe4e7a4d5366b228072834674f77fa0ba.tar.lz re3-224e805fe4e7a4d5366b228072834674f77fa0ba.tar.xz re3-224e805fe4e7a4d5366b228072834674f77fa0ba.tar.zst re3-224e805fe4e7a4d5366b228072834674f77fa0ba.zip | |
Diffstat (limited to '')
| -rw-r--r-- | src/core/Radar.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/core/Radar.cpp b/src/core/Radar.cpp index 816da6b9..2b72e0fb 100644 --- a/src/core/Radar.cpp +++ b/src/core/Radar.cpp @@ -1297,10 +1297,16 @@ void CRadar::TransformRadarPointToScreenSpace(CVector2D &out, const CVector2D &i } else #endif { +#ifdef ASPECT_RATIO_SCALE +#define _RADAR_WIDTH ((CMenuManager::m_PrefsSpriteScalingMode==SCL_AUTO) ? (RADAR_HEIGHT) : (RADAR_WIDTH)) +#else +#define _RADAR_WIDTH RADAR_WIDTH +#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); } |