diff options
| author | eray orçunus <erayorcunus@gmail.com> | 2020-04-16 21:19:56 +0200 |
|---|---|---|
| committer | eray orçunus <erayorcunus@gmail.com> | 2020-04-16 21:19:56 +0200 |
| commit | 2c2da558cac7e235d1dc89264aa78695aae32394 (patch) | |
| tree | 78ca1babbac01fff758c20ed9ae4bc3ffb210095 /src/core/Radar.cpp | |
| parent | More refs removed (diff) | |
| download | re3-2c2da558cac7e235d1dc89264aa78695aae32394.tar re3-2c2da558cac7e235d1dc89264aa78695aae32394.tar.gz re3-2c2da558cac7e235d1dc89264aa78695aae32394.tar.bz2 re3-2c2da558cac7e235d1dc89264aa78695aae32394.tar.lz re3-2c2da558cac7e235d1dc89264aa78695aae32394.tar.xz re3-2c2da558cac7e235d1dc89264aa78695aae32394.tar.zst re3-2c2da558cac7e235d1dc89264aa78695aae32394.zip | |
Diffstat (limited to 'src/core/Radar.cpp')
| -rw-r--r-- | src/core/Radar.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/core/Radar.cpp b/src/core/Radar.cpp index 154e7e9a..ed24814d 100644 --- a/src/core/Radar.cpp +++ b/src/core/Radar.cpp @@ -16,9 +16,9 @@ #include "Streaming.h" #include "SpecialFX.h" -float &CRadar::m_radarRange = *(float*)0x8E281C; -sRadarTrace (&CRadar::ms_RadarTrace)[NUMRADARBLIPS] = *(sRadarTrace(*)[NUMRADARBLIPS]) * (uintptr*)0x6ED5E0; -CVector2D &vec2DRadarOrigin = *(CVector2D*)0x6299B8; +float CRadar::m_radarRange; +sRadarTrace CRadar::ms_RadarTrace[NUMRADARBLIPS]; +CVector2D vec2DRadarOrigin; int32 gRadarTxdIds[64];// = (int*)0x6299C0; CSprite2d CRadar::AsukaSprite;// = *(CSprite2d*)0x8F1A40; @@ -81,6 +81,7 @@ CRGBA CRadar::ArrowBlipColour2; uint16 CRadar::MapLegendCounter; uint16 CRadar::MapLegendList[NUM_MAP_LEGENDS]; int CRadar::TargetMarkerId = -1; +CVector CRadar::TargetMarkerPos; #endif // taken from VC @@ -1442,6 +1443,7 @@ CRadar::ToggleTargetMarker(float x, float y) ms_RadarTrace[nextBlip].m_bInUse = 1; ms_RadarTrace[nextBlip].m_Radius = 1.0f; CVector pos(x, y, CWorld::FindGroundZForCoord(x,y)); + TargetMarkerPos = pos; ms_RadarTrace[nextBlip].m_vec2DPos = pos; ms_RadarTrace[nextBlip].m_vecPos = pos; ms_RadarTrace[nextBlip].m_nEntityHandle = 0; |