summaryrefslogtreecommitdiffstats
path: root/src/core
diff options
context:
space:
mode:
authorSergeanur <s.anureev@yandex.ua>2021-07-31 19:06:20 +0200
committerGitHub <noreply@github.com>2021-07-31 19:06:20 +0200
commit9d25e7f315c3cb16315021af6d8465dc38a6c736 (patch)
treee57eb0f90bc61b9effaf57b46e5a752d4d6ff3e5 /src/core
parentCVisibilityPlugins and CRenderer fixes (diff)
parentProperly fix blip rendering during scripted sequences (diff)
downloadre3-9d25e7f315c3cb16315021af6d8465dc38a6c736.tar
re3-9d25e7f315c3cb16315021af6d8465dc38a6c736.tar.gz
re3-9d25e7f315c3cb16315021af6d8465dc38a6c736.tar.bz2
re3-9d25e7f315c3cb16315021af6d8465dc38a6c736.tar.lz
re3-9d25e7f315c3cb16315021af6d8465dc38a6c736.tar.xz
re3-9d25e7f315c3cb16315021af6d8465dc38a6c736.tar.zst
re3-9d25e7f315c3cb16315021af6d8465dc38a6c736.zip
Diffstat (limited to 'src/core')
-rw-r--r--src/core/Radar.cpp18
1 files changed, 15 insertions, 3 deletions
diff --git a/src/core/Radar.cpp b/src/core/Radar.cpp
index 77d6cc7f..e0203355 100644
--- a/src/core/Radar.cpp
+++ b/src/core/Radar.cpp
@@ -485,7 +485,11 @@ void CRadar::Draw3dMarkers()
void CRadar::DrawBlips()
{
- if (!TheCamera.m_WideScreenOn && CHud::m_Wants_To_Draw_Hud) {
+ if ((!TheCamera.m_WideScreenOn && CHud::m_Wants_To_Draw_Hud)
+#ifdef MENU_MAP
+ || CMenuManager::bMenuMapActive
+#endif
+ ) {
RwRenderStateSet(rwRENDERSTATEZWRITEENABLE, (void*)FALSE);
RwRenderStateSet(rwRENDERSTATEZTESTENABLE, (void*)FALSE);
RwRenderStateSet(rwRENDERSTATEVERTEXALPHAENABLE, (void*)TRUE);
@@ -1216,7 +1220,11 @@ void CRadar::ShowRadarMarker(CVector pos, uint32 color, float radius) {
void CRadar::ShowRadarTrace(float x, float y, uint32 size, uint8 red, uint8 green, uint8 blue, uint8 alpha)
{
- if (!CHud::m_Wants_To_Draw_Hud || TheCamera.m_WideScreenOn)
+ if ((TheCamera.m_WideScreenOn || !CHud::m_Wants_To_Draw_Hud)
+#ifdef MENU_MAP
+ && !CMenuManager::bMenuMapActive
+#endif
+ )
return;
CSprite2d::DrawRect(CRect(x - SCREEN_SCALE_X(size + 1.0f), y - SCREEN_SCALE_Y(size + 1.0f), SCREEN_SCALE_X(size + 1.0f) + x, SCREEN_SCALE_Y(size + 1.0f) + y), CRGBA(0, 0, 0, alpha));
@@ -1225,7 +1233,11 @@ void CRadar::ShowRadarTrace(float x, float y, uint32 size, uint8 red, uint8 gree
void CRadar::ShowRadarTraceWithHeight(float x, float y, uint32 size, uint8 red, uint8 green, uint8 blue, uint8 alpha, uint8 mode)
{
- if (!CHud::m_Wants_To_Draw_Hud || TheCamera.m_WideScreenOn)
+ if ((TheCamera.m_WideScreenOn || !CHud::m_Wants_To_Draw_Hud)
+#ifdef MENU_MAP
+ && !CMenuManager::bMenuMapActive
+#endif
+ )
return;
switch (mode)