summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXinerki <simasadves@gmail.com>2020-05-21 11:21:02 +0200
committerXinerki <simasadves@gmail.com>2020-05-21 11:21:02 +0200
commit6d32cf4a11fa5011d7966745f5281ecac440a21a (patch)
tree836ddda22443e116c3cc7323efacbcc81bfd3ba7
parentMerge pull request #573 from Nick007J/miami (diff)
downloadre3-6d32cf4a11fa5011d7966745f5281ecac440a21a.tar
re3-6d32cf4a11fa5011d7966745f5281ecac440a21a.tar.gz
re3-6d32cf4a11fa5011d7966745f5281ecac440a21a.tar.bz2
re3-6d32cf4a11fa5011d7966745f5281ecac440a21a.tar.lz
re3-6d32cf4a11fa5011d7966745f5281ecac440a21a.tar.xz
re3-6d32cf4a11fa5011d7966745f5281ecac440a21a.tar.zst
re3-6d32cf4a11fa5011d7966745f5281ecac440a21a.zip
Diffstat (limited to '')
-rw-r--r--src/core/Radar.cpp13
1 files changed, 9 insertions, 4 deletions
diff --git a/src/core/Radar.cpp b/src/core/Radar.cpp
index 1267896a..6cff26ed 100644
--- a/src/core/Radar.cpp
+++ b/src/core/Radar.cpp
@@ -16,6 +16,11 @@
#include "Streaming.h"
#include "SpecialFX.h"
+CRGBA CARBLIP_COLOR(252, 138, 242, 255);
+CRGBA CHARBLIP_COLOR(252, 138, 242, 255);
+CRGBA OBJECTBLIP_COLOR(252, 138, 242, 255);
+CRGBA COORDBLIP_COLOR(252, 138, 242, 255);
+
float CRadar::m_radarRange;
sRadarTrace CRadar::ms_RadarTrace[NUMRADARBLIPS];
CVector2D vec2DRadarOrigin;
@@ -431,7 +436,7 @@ void CRadar::Draw3dMarkers()
if (ms_RadarTrace[i].m_eBlipDisplay == BLIP_DISPLAY_BOTH || ms_RadarTrace[i].m_eBlipDisplay == BLIP_DISPLAY_MARKER_ONLY) {
CVector pos = entity->GetPosition();
pos.z += 1.2f * CModelInfo::GetModelInfo(entity->GetModelIndex())->GetColModel()->boundingBox.max.z + 2.5f;
- C3dMarkers::PlaceMarker(i | (ms_RadarTrace[i].m_BlipIndex << 16), 1, pos, 2.5f, 0, 128, 255, 255, 1024, 0.2f, 5);
+ C3dMarkers::PlaceMarker(i | (ms_RadarTrace[i].m_BlipIndex << 16), 1, pos, 2.5f, 0, CARBLIP_COLOR.r, CARBLIP_COLOR.g, CARBLIP_COLOR.b, 1024, 0.2f, 5);
}
break;
}
@@ -445,7 +450,7 @@ void CRadar::Draw3dMarkers()
if (ms_RadarTrace[i].m_eBlipDisplay == BLIP_DISPLAY_BOTH || ms_RadarTrace[i].m_eBlipDisplay == BLIP_DISPLAY_MARKER_ONLY) {
CVector pos = entity->GetPosition();
pos.z += 3.0f;
- C3dMarkers::PlaceMarker(i | (ms_RadarTrace[i].m_BlipIndex << 16), 1, pos, 1.5f, 0, 128, 255, 255, 1024, 0.2f, 5);
+ C3dMarkers::PlaceMarker(i | (ms_RadarTrace[i].m_BlipIndex << 16), 1, pos, 1.5f, 0, CHARBLIP_COLOR.r, CHARBLIP_COLOR.g, CHARBLIP_COLOR.b, 1024, 0.2f, 5);
}
break;
}
@@ -455,7 +460,7 @@ void CRadar::Draw3dMarkers()
if (ms_RadarTrace[i].m_eBlipDisplay == BLIP_DISPLAY_BOTH || ms_RadarTrace[i].m_eBlipDisplay == BLIP_DISPLAY_MARKER_ONLY) {
CVector pos = entity->GetPosition();
pos.z += CModelInfo::GetModelInfo(entity->GetModelIndex())->GetColModel()->boundingBox.max.z + 1.0f + 1.0f;
- C3dMarkers::PlaceMarker(i | (ms_RadarTrace[i].m_BlipIndex << 16), 1, pos, 1.0f, 0, 128, 255, 255, 1024, 0.2f, 5);
+ C3dMarkers::PlaceMarker(i | (ms_RadarTrace[i].m_BlipIndex << 16), 1, pos, 1.0f, 0, OBJECTBLIP_COLOR.r, OBJECTBLIP_COLOR.g, OBJECTBLIP_COLOR.b, 1024, 0.2f, 5);
}
break;
}
@@ -464,7 +469,7 @@ void CRadar::Draw3dMarkers()
case BLIP_CONTACT_POINT:
if (!CTheScripts::IsPlayerOnAMission()) {
if (ms_RadarTrace[i].m_eBlipDisplay == BLIP_DISPLAY_BOTH || ms_RadarTrace[i].m_eBlipDisplay == BLIP_DISPLAY_MARKER_ONLY)
- C3dMarkers::PlaceMarkerSet(i | (ms_RadarTrace[i].m_BlipIndex << 16), 4, ms_RadarTrace[i].m_vecPos, 2.0f, 0, 128, 255, 128, 2048, 0.2f, 0);
+ C3dMarkers::PlaceMarkerSet(i | (ms_RadarTrace[i].m_BlipIndex << 16), 4, ms_RadarTrace[i].m_vecPos, 2.0f, 0, COORDBLIP_COLOR.r, COORDBLIP_COLOR.g, COORDBLIP_COLOR.b, 2048, 0.2f, 0);
}
break;
}