summaryrefslogtreecommitdiffstats
path: root/src/core/Radar.h
diff options
context:
space:
mode:
authoreray orçunus <erayorcunus@gmail.com>2020-07-04 22:50:43 +0200
committereray orçunus <erayorcunus@gmail.com>2020-07-04 22:50:43 +0200
commitceb1defc4e220037ad1b17eb2b8a497c1385de7b (patch)
tree12b180ce323a9166a50bb4d028a0bdc27f31b76c /src/core/Radar.h
parentMerge pull request #648 from Nick007J/miami (diff)
downloadre3-ceb1defc4e220037ad1b17eb2b8a497c1385de7b.tar
re3-ceb1defc4e220037ad1b17eb2b8a497c1385de7b.tar.gz
re3-ceb1defc4e220037ad1b17eb2b8a497c1385de7b.tar.bz2
re3-ceb1defc4e220037ad1b17eb2b8a497c1385de7b.tar.lz
re3-ceb1defc4e220037ad1b17eb2b8a497c1385de7b.tar.xz
re3-ceb1defc4e220037ad1b17eb2b8a497c1385de7b.tar.zst
re3-ceb1defc4e220037ad1b17eb2b8a497c1385de7b.zip
Diffstat (limited to '')
-rw-r--r--src/core/Radar.h10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/core/Radar.h b/src/core/Radar.h
index 95b74b84..a36faaea 100644
--- a/src/core/Radar.h
+++ b/src/core/Radar.h
@@ -21,6 +21,8 @@
#define COORDBLIP_MARKER_COLOR_B 242
#define COORDBLIP_MARKER_COLOR_A 255
+#define NUM_MAP_LEGENDS 75
+
#define MENU_MAP_LENGTH_UNIT 1190.0f // in game unit
#define MENU_MAP_WIDTH_SCALE 1.112f // in game unit (originally 1.112494151260504f)
#define MENU_MAP_HEIGHT_SCALE 1.119f // in game unit (originally 1.118714268907563f)
@@ -48,10 +50,8 @@ enum eBlipDisplay
enum eRadarSprite
{
-#ifdef MENU_MAP
RADAR_SPRITE_ENTITY_BLIP = -2,
RADAR_SPRITE_COORD_BLIP = -1,
-#endif
RADAR_SPRITE_NONE = 0,
RADAR_SPRITE_CENTRE,
RADAR_SPRITE_MAP_HERE,
@@ -173,17 +173,19 @@ public:
static CSprite2d *RadarSprites[RADAR_SPRITE_COUNT];
static float cachedCos;
static float cachedSin;
-#ifdef MENU_MAP
-#define NUM_MAP_LEGENDS 75
static CRGBA ArrowBlipColour1;
static CRGBA ArrowBlipColour2;
static int16 MapLegendList[NUM_MAP_LEGENDS];
static uint16 MapLegendCounter;
+
+#ifdef MAP_ENHANCEMENTS
static int TargetMarkerId;
static CVector TargetMarkerPos;
+#endif
static void InitFrontEndMap();
static void DrawYouAreHereSprite(float, float);
+#ifdef MAP_ENHANCEMENTS
static void ToggleTargetMarker(float, float);
#endif
static uint8 CalculateBlipAlpha(float dist);