From eefd71196c0cc65c17d97e3f588a97cc495ae73c Mon Sep 17 00:00:00 2001 From: gir489 <100792176+gir489returns@users.noreply.github.com> Date: Sat, 3 Aug 2024 12:19:43 -0400 Subject: [PATCH] Removed errant waypoint icons in get_objective_location. (#3509) --- .../looped/system/auto_tp_to_waypoint.cpp | 36 +- src/backend/looped/vehicle/auto_drive.cpp | 218 +-- src/backend/looped/world/beacon.cpp | 210 +-- src/gta/enums.hpp | 1337 +++++++++++------ src/util/blip.cpp | 14 +- src/util/teleport.hpp | 4 +- src/views/players/player/player_teleport.cpp | 2 +- 7 files changed, 1121 insertions(+), 700 deletions(-) diff --git a/src/backend/looped/system/auto_tp_to_waypoint.cpp b/src/backend/looped/system/auto_tp_to_waypoint.cpp index ff877206..dc14960d 100644 --- a/src/backend/looped/system/auto_tp_to_waypoint.cpp +++ b/src/backend/looped/system/auto_tp_to_waypoint.cpp @@ -1,18 +1,18 @@ -#include "backend/looped_command.hpp" -#include "natives.hpp" -#include "util/teleport.hpp" - -namespace big -{ - class auto_tp_to_waypoint : looped_command - { - using looped_command::looped_command; - - virtual void on_tick() override - { - teleport::to_blip((int)BlipIcons::Waypoint); - } - }; - - auto_tp_to_waypoint g_auto_tp_to_waypoint("autotptowp", "BACKEND_LOOPED_AUTO_TP_TO_WAYPOINT", "BACKEND_LOOPED_AUTO_TP_TO_WAYPOINT_DESC", g.self.auto_tp); -} +#include "backend/looped_command.hpp" +#include "natives.hpp" +#include "util/teleport.hpp" + +namespace big +{ + class auto_tp_to_waypoint : looped_command + { + using looped_command::looped_command; + + virtual void on_tick() override + { + teleport::to_blip((int)BlipIcons::RADAR_WAYPOINT); + } + }; + + auto_tp_to_waypoint g_auto_tp_to_waypoint("autotptowp", "BACKEND_LOOPED_AUTO_TP_TO_WAYPOINT", "BACKEND_LOOPED_AUTO_TP_TO_WAYPOINT_DESC", g.self.auto_tp); +} diff --git a/src/backend/looped/vehicle/auto_drive.cpp b/src/backend/looped/vehicle/auto_drive.cpp index ad58eca8..26637c35 100644 --- a/src/backend/looped/vehicle/auto_drive.cpp +++ b/src/backend/looped/vehicle/auto_drive.cpp @@ -1,109 +1,109 @@ -#include "backend/looped/looped.hpp" -#include "gta/enums.hpp" -#include "natives.hpp" -#include "util/blip.hpp" -#include "util/entity.hpp" -#include "util/vehicle.hpp" - -namespace big -{ - void looped::vehicle_auto_drive() - { - static std::unordered_map driving_style_flags = {{AutoDriveStyle::LAW_ABIDING, 443}, {AutoDriveStyle::THE_ROAD_IS_YOURS, 787004}}; - - static int changing_driving_styles = false; - static AutoDriveDestination current_destination = AutoDriveDestination::STOPPED; - static int current_driving_flag = driving_style_flags[AutoDriveStyle::LAW_ABIDING]; - static float current_speed = 8; - static bool started = false; - static Vector3 waypoint; - - if (g.vehicle.auto_drive_destination != AutoDriveDestination::STOPPED) - { - current_destination = g.vehicle.auto_drive_destination; - g.vehicle.auto_drive_destination = AutoDriveDestination::STOPPED; - changing_driving_styles = true; - } - - if (!self::veh && current_destination != AutoDriveDestination::STOPPED) - { - current_destination = AutoDriveDestination::STOPPED; - changing_driving_styles = false; - g_notification_service.push_warning("AUTO_DRIVE"_T.data(), "PLAYER_INFO_NO_VEHICLE"_T.data()); - } - else if (current_driving_flag != driving_style_flags[g.vehicle.auto_drive_style] || current_speed != g.vehicle.auto_drive_speed) - { - current_driving_flag = driving_style_flags[g.vehicle.auto_drive_style]; - current_speed = g.vehicle.auto_drive_speed; - changing_driving_styles = true; - } - - if (current_destination != AutoDriveDestination::STOPPED) - { - Vector3 last_waypoint = waypoint; - bool does_waypoint_exist = false; - bool to_waypoint = false; - - if (current_destination == AutoDriveDestination::OBJECTITVE) - { - to_waypoint = true; - does_waypoint_exist = blip::get_objective_location(waypoint); - } - else if (current_destination == AutoDriveDestination::WAYPOINT) - { - to_waypoint = true; - does_waypoint_exist = blip::get_blip_location(waypoint, (int)BlipIcons::Waypoint); - } - - if (does_waypoint_exist - && (last_waypoint.x != waypoint.x || last_waypoint.y != waypoint.y || last_waypoint.z != waypoint.z)) - { - changing_driving_styles = true; - } - - bool interupted = (PAD::IS_CONTROL_PRESSED(0, (int)ControllerInputs::INPUT_VEH_MOVE_LEFT_ONLY) || PAD::IS_CONTROL_PRESSED(0, (int)ControllerInputs::INPUT_VEH_MOVE_RIGHT_ONLY) || PAD::IS_CONTROL_PRESSED(0, (int)ControllerInputs::INPUT_VEH_ACCELERATE) || PAD::IS_CONTROL_PRESSED(0, (int)ControllerInputs::INPUT_VEH_BRAKE) || PAD::IS_CONTROL_PRESSED(0, (int)ControllerInputs::INPUT_VEH_EXIT) || PAD::IS_CONTROL_PRESSED(0, (int)ControllerInputs::INPUT_VEH_HANDBRAKE)); - - if (current_destination == AutoDriveDestination::EMERGENCY_STOP || (to_waypoint && !does_waypoint_exist) || interupted) - { - TASK::CLEAR_PRIMARY_VEHICLE_TASK(self::veh); - TASK::CLEAR_PED_TASKS(self::ped); - - if (!interupted && started) - { - VEHICLE::SET_VEHICLE_FORWARD_SPEED(self::veh, 0); - } - - current_destination = AutoDriveDestination::STOPPED; - - if (to_waypoint && !does_waypoint_exist) - { - g_notification_service.push_warning("AUTO_DRIVE"_T.data(), "TELEPORT_NO_WAYPOINT_SET"_T.data()); - } - else - { - g_notification_service.push_warning("AUTO_DRIVE"_T.data(), "BACKEND_LOOPED_VEHICLE_AUTO_DRIVE_STOPPED"_T.data()); - } - - started = false; - } - else if (changing_driving_styles) - { - changing_driving_styles = false; - - TASK::CLEAR_PRIMARY_VEHICLE_TASK(self::veh); - TASK::CLEAR_PED_TASKS(self::ped); - - if (to_waypoint) - { - TASK::TASK_VEHICLE_DRIVE_TO_COORD_LONGRANGE(self::ped, self::veh, waypoint.x, waypoint.y, waypoint.z, current_speed, current_driving_flag, 20); - } - else - { - TASK::TASK_VEHICLE_DRIVE_WANDER(self::ped, self::veh, current_speed, current_driving_flag); - } - - started = true; - } - } - } -} +#include "backend/looped/looped.hpp" +#include "gta/enums.hpp" +#include "natives.hpp" +#include "util/blip.hpp" +#include "util/entity.hpp" +#include "util/vehicle.hpp" + +namespace big +{ + void looped::vehicle_auto_drive() + { + static std::unordered_map driving_style_flags = {{AutoDriveStyle::LAW_ABIDING, 443}, {AutoDriveStyle::THE_ROAD_IS_YOURS, 787004}}; + + static int changing_driving_styles = false; + static AutoDriveDestination current_destination = AutoDriveDestination::STOPPED; + static int current_driving_flag = driving_style_flags[AutoDriveStyle::LAW_ABIDING]; + static float current_speed = 8; + static bool started = false; + static Vector3 waypoint; + + if (g.vehicle.auto_drive_destination != AutoDriveDestination::STOPPED) + { + current_destination = g.vehicle.auto_drive_destination; + g.vehicle.auto_drive_destination = AutoDriveDestination::STOPPED; + changing_driving_styles = true; + } + + if (!self::veh && current_destination != AutoDriveDestination::STOPPED) + { + current_destination = AutoDriveDestination::STOPPED; + changing_driving_styles = false; + g_notification_service.push_warning("AUTO_DRIVE"_T.data(), "PLAYER_INFO_NO_VEHICLE"_T.data()); + } + else if (current_driving_flag != driving_style_flags[g.vehicle.auto_drive_style] || current_speed != g.vehicle.auto_drive_speed) + { + current_driving_flag = driving_style_flags[g.vehicle.auto_drive_style]; + current_speed = g.vehicle.auto_drive_speed; + changing_driving_styles = true; + } + + if (current_destination != AutoDriveDestination::STOPPED) + { + Vector3 last_waypoint = waypoint; + bool does_waypoint_exist = false; + bool to_waypoint = false; + + if (current_destination == AutoDriveDestination::OBJECTITVE) + { + to_waypoint = true; + does_waypoint_exist = blip::get_objective_location(waypoint); + } + else if (current_destination == AutoDriveDestination::WAYPOINT) + { + to_waypoint = true; + does_waypoint_exist = blip::get_blip_location(waypoint, (int)BlipIcons::RADAR_WAYPOINT); + } + + if (does_waypoint_exist + && (last_waypoint.x != waypoint.x || last_waypoint.y != waypoint.y || last_waypoint.z != waypoint.z)) + { + changing_driving_styles = true; + } + + bool interupted = (PAD::IS_CONTROL_PRESSED(0, (int)ControllerInputs::INPUT_VEH_MOVE_LEFT_ONLY) || PAD::IS_CONTROL_PRESSED(0, (int)ControllerInputs::INPUT_VEH_MOVE_RIGHT_ONLY) || PAD::IS_CONTROL_PRESSED(0, (int)ControllerInputs::INPUT_VEH_ACCELERATE) || PAD::IS_CONTROL_PRESSED(0, (int)ControllerInputs::INPUT_VEH_BRAKE) || PAD::IS_CONTROL_PRESSED(0, (int)ControllerInputs::INPUT_VEH_EXIT) || PAD::IS_CONTROL_PRESSED(0, (int)ControllerInputs::INPUT_VEH_HANDBRAKE)); + + if (current_destination == AutoDriveDestination::EMERGENCY_STOP || (to_waypoint && !does_waypoint_exist) || interupted) + { + TASK::CLEAR_PRIMARY_VEHICLE_TASK(self::veh); + TASK::CLEAR_PED_TASKS(self::ped); + + if (!interupted && started) + { + VEHICLE::SET_VEHICLE_FORWARD_SPEED(self::veh, 0); + } + + current_destination = AutoDriveDestination::STOPPED; + + if (to_waypoint && !does_waypoint_exist) + { + g_notification_service.push_warning("AUTO_DRIVE"_T.data(), "TELEPORT_NO_WAYPOINT_SET"_T.data()); + } + else + { + g_notification_service.push_warning("AUTO_DRIVE"_T.data(), "BACKEND_LOOPED_VEHICLE_AUTO_DRIVE_STOPPED"_T.data()); + } + + started = false; + } + else if (changing_driving_styles) + { + changing_driving_styles = false; + + TASK::CLEAR_PRIMARY_VEHICLE_TASK(self::veh); + TASK::CLEAR_PED_TASKS(self::ped); + + if (to_waypoint) + { + TASK::TASK_VEHICLE_DRIVE_TO_COORD_LONGRANGE(self::ped, self::veh, waypoint.x, waypoint.y, waypoint.z, current_speed, current_driving_flag, 20); + } + else + { + TASK::TASK_VEHICLE_DRIVE_WANDER(self::ped, self::veh, current_speed, current_driving_flag); + } + + started = true; + } + } + } +} diff --git a/src/backend/looped/world/beacon.cpp b/src/backend/looped/world/beacon.cpp index 707f71d7..bd515308 100644 --- a/src/backend/looped/world/beacon.cpp +++ b/src/backend/looped/world/beacon.cpp @@ -1,106 +1,106 @@ -#include "backend/looped_command.hpp" -#include "natives.hpp" -#include "script.hpp" -#include "util/blip.hpp" - -namespace big -{ - class waypoint_beacon : looped_command - { - using looped_command::looped_command; - - virtual void on_tick() override - { - Vector3 location; - - if (blip::get_blip_location(location, (int)BlipIcons::Waypoint)) - { - int color[3] = {0, 0, 0}; - - for (int i = 0; i < 3; i++) - color[i] = (int)(255 * g.world.waypoint_n_objective.waypoint_beacon_color[i]); - - // no need to bool check this, z-coord just have to be under/on the ground it doesn't really matter - MISC::GET_GROUND_Z_FOR_3D_COORD(location.x, location.y, location.z, &location.z, 1, 0); - - GRAPHICS::DRAW_MARKER_EX(1, - location.x, - location.y, - location.z, - 0.f, - 0.f, - 0.f, - 0.f, - 0.f, - 0.f, - 7.5f, - 7.f, - location.z + 1500.f, // the beam's end - color[0], - color[1], - color[2], - 180, - 0, - 0, - 2, - 0, - 0, - 0, - 0, - 1, - 1); - } - } - }; - - class objective_beacon : looped_command - { - using looped_command::looped_command; - - virtual void on_tick() override - { - Vector3 location; - - if (blip::get_objective_location(location)) - { - int color[3] = {0, 0, 0}; - - for (int i = 0; i < 3; i++) - color[i] = (int)(255 * g.world.waypoint_n_objective.objective_beacon_color[i]); - - // no need to bool check this, z-coord just have to be under/on the ground it doesn't really matter - MISC::GET_GROUND_Z_FOR_3D_COORD(location.x, location.y, location.z, &location.z, 1, 0); - - GRAPHICS::DRAW_MARKER_EX(1, - location.x, - location.y, - location.z, - 0.f, - 0.f, - 0.f, - 0.f, - 0.f, - 0.f, - 7.5f, - 7.f, - location.z + 1500.f, // the beam's end - color[0], - color[1], - color[2], - 180, - 0, - 0, - 2, - 0, - 0, - 0, - 0, - 1, - 1); - } - } - }; - - waypoint_beacon g_waypoint_beacon("waypointbeacon", "BACKEND_LOOPED_WORLD_BEACON_WAYPOINT", "BACKEND_LOOPED_WORLD_BEACON_WAYPOINT_DESC", g.world.waypoint_n_objective.waypoint_beacon); - objective_beacon g_objective_beacon("objectivebeacon", "BACKEND_LOOPED_WORLD_BEACON_OBJECTIVE", "BACKEND_LOOPED_WORLD_BEACON_OBJECTIVE_DESC", g.world.waypoint_n_objective.objective_beacon); +#include "backend/looped_command.hpp" +#include "natives.hpp" +#include "script.hpp" +#include "util/blip.hpp" + +namespace big +{ + class waypoint_beacon : looped_command + { + using looped_command::looped_command; + + virtual void on_tick() override + { + Vector3 location; + + if (blip::get_blip_location(location, (int)BlipIcons::RADAR_WAYPOINT)) + { + int color[3] = {0, 0, 0}; + + for (int i = 0; i < 3; i++) + color[i] = (int)(255 * g.world.waypoint_n_objective.waypoint_beacon_color[i]); + + // no need to bool check this, z-coord just have to be under/on the ground it doesn't really matter + MISC::GET_GROUND_Z_FOR_3D_COORD(location.x, location.y, location.z, &location.z, 1, 0); + + GRAPHICS::DRAW_MARKER_EX(1, + location.x, + location.y, + location.z, + 0.f, + 0.f, + 0.f, + 0.f, + 0.f, + 0.f, + 7.5f, + 7.f, + location.z + 1500.f, // the beam's end + color[0], + color[1], + color[2], + 180, + 0, + 0, + 2, + 0, + 0, + 0, + 0, + 1, + 1); + } + } + }; + + class objective_beacon : looped_command + { + using looped_command::looped_command; + + virtual void on_tick() override + { + Vector3 location; + + if (blip::get_objective_location(location)) + { + int color[3] = {0, 0, 0}; + + for (int i = 0; i < 3; i++) + color[i] = (int)(255 * g.world.waypoint_n_objective.objective_beacon_color[i]); + + // no need to bool check this, z-coord just have to be under/on the ground it doesn't really matter + MISC::GET_GROUND_Z_FOR_3D_COORD(location.x, location.y, location.z, &location.z, 1, 0); + + GRAPHICS::DRAW_MARKER_EX(1, + location.x, + location.y, + location.z, + 0.f, + 0.f, + 0.f, + 0.f, + 0.f, + 0.f, + 7.5f, + 7.f, + location.z + 1500.f, // the beam's end + color[0], + color[1], + color[2], + 180, + 0, + 0, + 2, + 0, + 0, + 0, + 0, + 1, + 1); + } + } + }; + + waypoint_beacon g_waypoint_beacon("waypointbeacon", "BACKEND_LOOPED_WORLD_BEACON_WAYPOINT", "BACKEND_LOOPED_WORLD_BEACON_WAYPOINT_DESC", g.world.waypoint_n_objective.waypoint_beacon); + objective_beacon g_objective_beacon("objectivebeacon", "BACKEND_LOOPED_WORLD_BEACON_OBJECTIVE", "BACKEND_LOOPED_WORLD_BEACON_OBJECTIVE_DESC", g.world.waypoint_n_objective.objective_beacon); } \ No newline at end of file diff --git a/src/gta/enums.hpp b/src/gta/enums.hpp index 6750db2d..4b103404 100644 --- a/src/gta/enums.hpp +++ b/src/gta/enums.hpp @@ -564,464 +564,887 @@ enum class WorldStateDataType VehiclePlayerLocking }; -enum class BlipIcons +enum class BlipIcons : int32_t //https://docs.fivem.net/docs/game-references/blips/ { - Null, - Circle, - Empty, - Cop, - CopSearchZone, - Square, - PlayerArrow, - North, - Waypoint, - BigCircle, - BigCircleOutline, - ArrowUpOutlined, - ArrowDownOutlined, - ArrowUp, - ArrowDown, - PoliceHelicopter, - Jet, - Number1, - Number2, - Number3, - Number4, - Number5, - Number6, - Number7, - Number8, - Number9, - Number10, - GTAOCrew, - GTAOFriend, - CableCar = 36, - RaceFinish = 38, - Safehouse = 40, - Cop2, - CopCar, - Helicopter, - ChatBubble = 47, - Garage = 50, - Drugs, - ConvenienceStore, - PoliceCar = 56, - Circle2, - CircleWithStar, - ConvenienceStore2, - ShieldWithStar, - Asterisk, - Helicopter2 = 64, - StrangersAndFreaks = 66, - ArmoredTruck, - TowTruck, - Barber = 71, - LosSantosCustoms, - Clothes, - TattooParlor = 75, - Simeon, - Lester, - Michael, - Trevor, - Heist1, - Rampage = 84, - VinewoodTours, - Franklin, - Franklin2 = 88, - Chinese, - FlightSchool, - Bar = 93, - ParachuteJump, - Heist2 = 96, - CarWash = 100, - ComedyClub = 102, - Darts, - FIB = 106, - Heist3, - DollarSign, - Golf, - AmmuNation, - Exile = 112, - ShootingRange = 119, - Solomon, - StripClub, - Tennis, - Triathlon = 126, - OffRoadRaceFinish, - Key = 134, - MovieTheater, - Music, - Marijuana = 140, - Hunting, - ArmsTraffickingGround = 147, - Nigel = 149, - AssaultRifle, - Bat, - Grenade, - Health, - Knife, - Molotov, - Pistol, - RPG, - Shotgun, - SMG, - Sniper, - SonicWave, - PointOfInterest, - GTAOPassive, - GTAOUsingMenu, - Link = 171, - Minigun = 173, - GrenadeLauncher, - Armor, - Castle, - CameraIcon = 184, - Handcuffs = 188, - Yoga = 197, - Cab, - Number11, - Number12, - Number13, - Number14, - Number15, - Number16, - Shrink, - Epsilon, - PersonalVehicleCar = 225, - PersonalVehicleBike, - Custody = 237, - ArmsTraffickingAir = 251, - Fairground = 266, - PropertyManagement, - Altruist = 269, - Enemy, - Chop = 273, - Dead, - Hooker = 279, - Friend, - BountyHit = 303, - GTAOMission, - GTAOSurvival, - CrateDrop, - PlaneDrop, - Sub, - Race, - Deathmatch, - ArmWrestling, - AmmuNationShootingRange = 313, - RaceAir, - RaceCar, - RaceSea, - GarbageTruck = 318, - Motorcycle = 348, - SafehouseForSale = 350, - Package, - MartinMadrazo, - EnemyHelicopter, - Boost, - Devin, - Marina, - Garage2, - GolfFlag, - Hangar, - Helipad, - JerryCan, - Masks, - HeistSetup, - Incapacitated, - PickupSpawn, - BoilerSuit, - Completed, - Rockets, - GarageForSale, - HelipadForSale, - MarinaForSale, - HangarForSale, - Business = 374, - BusinessForSale, - RaceBike, - Parachute, - TeamDeathmatch, - RaceFoot, - VehicleDeathmatch, - Barry, - Dom, - MaryAnn, - Cletus, - Josh, - Minute, - Omega, - Tonya, - Paparazzo, - Crosshair, - Creator = 398, - CreatorDirection, - Abigail, - Blimp, - Repair, - Testosterone, - Dinghy, - Fanatic, - GangAttack, - Information, - CaptureBriefcase, - LastTeamStanding, - Boat, - CaptureHouse, - JerryCan2 = 415, - RPLogo, - GTAOPlayerSafehouse, - GTAOPlayerSafehouseBounty, - CaptureAmericanFlag, - CaptureFlag, - Tank, - PlayerHelicopter, - PlayerPlane, - PlayerJet, - PlayerArrowNoColor, - PlayerLAPV, - PlayerBoat, - HeistRoom, - Stopwatch = 430, - DollarSignCircled, - Crosshair2, - Crosshair3, - DollarSignSquared, - RaceFlagWithArrow, - Fire, - DoubleDeathmatchSkulls, - CastleIcon, - Crown, - SupplyBag, - QuadirectionalArrows, - Fox, - Triangle, - ThreeBars, - LamarDavis, - Mechanic, - LamarDavisOne, - LamarDavisTwo, - LamarDavisThree, - LamarDavisFour, - LamarDavisFive, - LamarDavisSix, - LamarDavisSeven, - LamarDavisEight, - Yacht, - SmallQuestionMark, - GymBag, - CrosshairWithPersonInMiddle, - PlayerSpeaking, - Taxi, - ShieldWithX, - YachtMinimap, - Fox2, - Hourglass, - SmallQuestionMark2, - Stopwatch2, - Restart, - SunWithEye, - Marijuana2, - Shotgun2, - Jetski, - EyeWithLineThroughIt, - Garage3, - GarageForSale2, - Building, - BuildingForSale, - Truck, - Crate, - Trailer, - Person, - Cargobob, - BigOutlineSquare, - Speedometer, - Ghost, - RemoteControl, - Bomb, - Shield, - StuntRace, - Heart, - StuntRaceMoney, - TeamDeathMatch2, - HouseWithGarage, - QuadirectionalArrowsWithMotorcycle, - CircleWithMotorcycle, - MotorcycleRace, - Weed, - Cocaine, - ForgedDocuments, - Meth, - CounterfeitMoney, - DrugPickup, - BigOne, - BigTwo, - BigThree, - BigFour, - BigFive, - BigSix, - BigSeven, - BigEight, - BigNine, - BigTen, - ATVQuad, - Bus, - BagMaybe, - UpArrowOnSquare, - FourPlayers, - EightPlayers, - TenPlayers, - TwelvePlayers, - SixteenPlayers, - Laptop, - Supercycle, - Supercar, - GarageWithCar, - PaperDocument, - ShieldWithBlackStar, - CraneClaw, - PhantomWedge, - BoxvilleArmored, - Ruiner2000, - RampBuggy, - Wastelander, - RocketVoltic, - TechnicalAqua, - LetterA, - LetterB, - LetterC, - LetterD, - LetterE, - LetterF, - LetterG, - LetterH, - SkullWithTriangleTop, - Wrench, - SteeringWheel, - Trolphy, - Rocket, - Missile, - Bullets, - Parachute2, - Number5WithCircle, - Number10WithCircle, - Number15WithCircle, - Number20WithCircle, - Number30WithCircle, - Bullets2, - Bunker, - InsurgentPickup, - Opressor, - TechnicalCustom, - DuneFAV, - HalfTrack, - AntiAircraftTrailer, - Satelite, - BunkerWithPeople, - ScrewdriverAndHammer, - UpgradedWeaponWorkbench, - CrateWithStraps, - AircraftHanger, - Icosikaitetragon, - RaceflagWithQuestionmark, - AlphaZ1, - Bombushka, - Havok, - HowardNX25, - Hunter, - Ultralight, - Mogul, - Molotok, - Nokota, - Pyro, - Rogue, - Starling, - Starbreeze, - Tula, - GymBagWithLetterH, - LockedCrate, - SateliteIcon, - Avenger, - IAAFacility, - DoomsdayHeist, - SAMTurret, - HackingPuzzleRed, - HackingPuzzleDiode, - Stromburg, - Deluxo, - ThrusterJetpack, - TM02KhanjaliTank, - RCV, - Volatol, - Barrage, - Akula, - Chernobog, - SpeakerMaybe, - YellowishBrownMoneySign, - ComputerTerminal, - HackingPuzzleMirror, - HackingPuzzleReflector, - HackingPuzzleRotator, - RaceFlagWithCrosshair, - RaceFlagWithSteeringWheel, - SeaSparrow, - Caracara, - Nightclub, - CrateB, - VanB, - Diamond, - BullionStacks, - CalculatorMaybe, - CarWithLightningBolt, - HeartIcon, - StarWithAdd, - StarWithSubtract, - BombWithAdd, - BombWithSubtract, - CrosshairDJ, - Drone, - Cashregister, - SpeakerMaybeBigger, - Skull, - FestivalBus, - Terrorbyte, - Menacer, - Scramjet, - PounderCustom, - MuleCustom, - SpeedoCustom, - BlimpIcon, - OpressorMKII, - B11StrikeForce, - GearWithCar, - GearWithMoney, - GearWithWrench, - RaceFlagWithGear, - CrosshairOnCar, - RCBandito, - RCRemote, - FlameSign, - ArrowSign, - GearSign, - RepeatSign, - DownArrowSign, - ExplosionSign, - WheelExplosionSign, - ElevatorSign, - ElevatorSign2, - EjectorPlatformSign, - Bruiser, - Brutus, - Cerberus, - Deathbike, - Dominator, - Impaler, - Imperator, - Issi, - Sasquatch, - Scarab, - Slamvan, - ZR380 + RADAR_HIGHER, + RADAR_LEVEL, + RADAR_LOWER, + RADAR_POLICE_PED, + RADAR_WANTED_RADIUS, + RADAR_AREA_BLIP, + RADAR_CENTRE, + RADAR_NORTH, + RADAR_WAYPOINT, + RADAR_RADIUS_BLIP, + RADAR_RADIUS_OUTLINE_BLIP, + RADAR_WEAPON_HIGHER, + RADAR_WEAPON_LOWER, + RADAR_HIGHER_AI, + RADAR_LOWER_AI, + RADAR_POLICE_HELI_SPIN, + RADAR_POLICE_PLANE_MOVE, + RADAR_NUMBERED_1, + RADAR_NUMBERED_2, + RADAR_NUMBERED_3, + RADAR_NUMBERED_4, + RADAR_NUMBERED_5, + RADAR_NUMBERED_6, + RADAR_NUMBERED_7, + RADAR_NUMBERED_8, + RADAR_NUMBERED_9, + RADAR_NUMBERED_10, + RADAR_MP_CREW, + RADAR_MP_FRIENDLIES, + RADAR_SCRIPT_OBJECTIVE = 32, + RADAR_STATION = 35, + RADAR_CABLE_CAR, + RADAR_ACTIVITIES, + RADAR_RACEFLAG, + RADAR_FIRE, + RADAR_SAFEHOUSE, + RADAR_POLICE, + RADAR_POLICE_CHASE, + RADAR_POLICE_HELI, + RADAR_BOMB_A, + RADAR_BOMB_B, + RADAR_BOMB_C, + RADAR_SNITCH, + RADAR_PLANNING_LOCATIONS, + RADAR_CRIM_ARREST, + RADAR_CRIM_CARSTEAL, + RADAR_CRIM_DRUGS, + RADAR_CRIM_HOLDUPS, + RADAR_CRIM_PIMPING, + RADAR_CRIM_PLAYER, + RADAR_FENCE, + RADAR_COP_PATROL, + RADAR_COP_PLAYER, + RADAR_CRIM_WANTED, + RADAR_HEIST, + RADAR_POLICE_STATION, + RADAR_HOSPITAL, + RADAR_ASSASSINS_MARK, + RADAR_ELEVATOR, + RADAR_HELICOPTER, + RADAR_JOYRIDERS, + RADAR_RANDOM_CHARACTER, + RADAR_SECURITY_VAN, + RADAR_TOW_TRUCK, + RADAR_DRIVE_THRU, + RADAR_ILLEGAL_PARKING, + RADAR_BARBER, + RADAR_CAR_MOD_SHOP, + RADAR_CLOTHES_STORE, + RADAR_GYM, + RADAR_TATTOO, + RADAR_ARMENIAN_FAMILY, + RADAR_LESTER_FAMILY, + RADAR_MICHAEL_FAMILY, + RADAR_TREVOR_FAMILY, + RADAR_JEWELRY_HEIST, + RADAR_DRAG_RACE, + RADAR_DRAG_RACE_FINISH, + RADAR_CAR_CARRIER, + RADAR_RAMPAGE, + RADAR_VINEWOOD_TOURS, + RADAR_LAMAR_FAMILY, + RADAR_TACO_VAN, + RADAR_FRANKLIN_FAMILY, + RADAR_CHINESE_STRAND, + RADAR_FLIGHT_SCHOOL, + RADAR_EYE_SKY, + RADAR_AIR_HOCKEY, + RADAR_BAR, + RADAR_BASE_JUMP, + RADAR_BASKETBALL, + RADAR_BIOLAB_HEIST, + RADAR_BOWLING, + RADAR_BURGER_SHOT, + RADAR_CABARET_CLUB, + RADAR_CAR_WASH, + RADAR_CLUCKIN_BELL, + RADAR_COMEDY_CLUB, + RADAR_DARTS, + RADAR_DOCKS_HEIST, + RADAR_FBI_HEIST, + RADAR_FBI_OFFICERS_STRAND, + RADAR_FINALE_BANK_HEIST, + RADAR_FINANCIER_STRAND, + RADAR_GOLF, + RADAR_GUN_SHOP, + RADAR_INTERNET_CAFE, + RADAR_MICHAEL_FAMILY_EXILE, + RADAR_NICE_HOUSE_HEIST, + RADAR_RANDOM_FEMALE, + RADAR_RANDOM_MALE, + RADAR_REPO, + RADAR_RESTAURANT, + RADAR_RURAL_BANK_HEIST, + RADAR_SHOOTING_RANGE, + RADAR_SOLOMON_STRAND, + RADAR_STRIP_CLUB, + RADAR_TENNIS, + RADAR_TREVOR_FAMILY_EXILE, + RADAR_MICHAEL_TREVOR_FAMILY, + RADAR_VEHICLE_SPAWN, + RADAR_TRIATHLON, + RADAR_OFF_ROAD_RACING, + RADAR_GANG_COPS, + RADAR_GANG_MEXICANS, + RADAR_GANG_BIKERS, + RADAR_GANG_FAMILIES, + RADAR_GANG_PROFESSIONALS, + RADAR_SNITCH_RED, + RADAR_CRIM_CUFF_KEYS, + RADAR_CINEMA, + RADAR_MUSIC_VENUE, + RADAR_POLICE_STATION_BLUE, + RADAR_AIRPORT, + RADAR_CRIM_SAVED_VEHICLE, + RADAR_WEED_STASH, + RADAR_HUNTING, + RADAR_POOL, + RADAR_OBJECTIVE_BLUE, + RADAR_OBJECTIVE_GREEN, + RADAR_OBJECTIVE_RED, + RADAR_OBJECTIVE_YELLOW, + RADAR_ARMS_DEALING, + RADAR_MP_FRIEND, + RADAR_CELEBRITY_THEFT, + RADAR_WEAPON_ASSAULT_RIFLE, + RADAR_WEAPON_BAT, + RADAR_WEAPON_GRENADE, + RADAR_WEAPON_HEALTH, + RADAR_WEAPON_KNIFE, + RADAR_WEAPON_MOLOTOV, + RADAR_WEAPON_PISTOL, + RADAR_WEAPON_ROCKET, + RADAR_WEAPON_SHOTGUN, + RADAR_WEAPON_SMG, + RADAR_WEAPON_SNIPER, + RADAR_MP_NOISE, + RADAR_POI, + RADAR_PASSIVE, + RADAR_USINGMENU, + RADAR_FRIEND_FRANKLIN_P, + RADAR_FRIEND_FRANKLIN_X, + RADAR_FRIEND_MICHAEL_P, + RADAR_FRIEND_MICHAEL_X, + RADAR_FRIEND_TREVOR_P, + RADAR_FRIEND_TREVOR_X, + RADAR_GANG_COPS_PARTNER, + RADAR_FRIEND_LAMAR, + RADAR_WEAPON_MINIGUN, + RADAR_WEAPON_GRENADELAUNCHER, + RADAR_WEAPON_ARMOUR, + RADAR_PROPERTY_TAKEOVER, + RADAR_GANG_MEXICANS_HIGHLIGHT, + RADAR_GANG_BIKERS_HIGHLIGHT, + RADAR_TRIATHLON_CYCLING, + RADAR_TRIATHLON_SWIMMING, + RADAR_PROPERTY_TAKEOVER_BIKERS, + RADAR_PROPERTY_TAKEOVER_COPS, + RADAR_PROPERTY_TAKEOVER_VAGOS, + RADAR_CAMERA, + RADAR_CENTRE_RED, + RADAR_HANDCUFF_KEYS_BIKERS, + RADAR_HANDCUFF_KEYS_VAGOS, + RADAR_HANDCUFFS_CLOSED_BIKERS, + RADAR_HANDCUFFS_CLOSED_VAGOS, + RADAR_HANDCUFFS_OPEN_BIKERS, + RADAR_HANDCUFFS_OPEN_VAGOS, + RADAR_CAMERA_BADGER, + RADAR_CAMERA_FACADE, + RADAR_CAMERA_IFRUIT, + RADAR_CRIM_ARREST_BIKERS, + RADAR_CRIM_ARREST_VAGOS, + RADAR_YOGA, + RADAR_TAXI, + RADAR_NUMBERED_11, + RADAR_NUMBERED_12, + RADAR_NUMBERED_13, + RADAR_NUMBERED_14, + RADAR_NUMBERED_15, + RADAR_NUMBERED_16, + RADAR_SHRINK, + RADAR_EPSILON, + RADAR_FINANCIER_STRAND_GREY, + RADAR_TREVOR_FAMILY_GREY, + RADAR_TREVOR_FAMILY_RED, + RADAR_FRANKLIN_FAMILY_GREY, + RADAR_FRANKLIN_FAMILY_BLUE, + RADAR_FRANKLIN_A, + RADAR_FRANKLIN_B, + RADAR_FRANKLIN_C, + RADAR_NUMBERED_RED_1, + RADAR_NUMBERED_RED_2, + RADAR_NUMBERED_RED_3, + RADAR_NUMBERED_RED_4, + RADAR_NUMBERED_RED_5, + RADAR_NUMBERED_RED_6, + RADAR_NUMBERED_RED_7, + RADAR_NUMBERED_RED_8, + RADAR_NUMBERED_RED_9, + RADAR_NUMBERED_RED_10, + RADAR_GANG_VEHICLE, + RADAR_GANG_VEHICLE_BIKERS, + RADAR_GANG_VEHICLE_COPS, + RADAR_GANG_VEHICLE_VAGOS, + RADAR_GUNCAR, + RADAR_DRIVING_BIKERS, + RADAR_DRIVING_COPS, + RADAR_DRIVING_VAGOS, + RADAR_GANG_COPS_HIGHLIGHT, + RADAR_SHIELD_BIKERS, + RADAR_SHIELD_COPS, + RADAR_SHIELD_VAGOS, + RADAR_CUSTODY_BIKERS, + RADAR_CUSTODY_VAGOS, + RADAR_GANG_WANTED_BIKERS, + RADAR_GANG_WANTED_BIKERS_1, + RADAR_GANG_WANTED_BIKERS_2, + RADAR_GANG_WANTED_BIKERS_3, + RADAR_GANG_WANTED_BIKERS_4, + RADAR_GANG_WANTED_BIKERS_5, + RADAR_GANG_WANTED_VAGOS, + RADAR_GANG_WANTED_VAGOS_1, + RADAR_GANG_WANTED_VAGOS_2, + RADAR_GANG_WANTED_VAGOS_3, + RADAR_GANG_WANTED_VAGOS_4, + RADAR_GANG_WANTED_VAGOS_5, + RADAR_ARMS_DEALING_AIR, + RADAR_PLAYERSTATE_ARRESTED, + RADAR_PLAYERSTATE_CUSTODY, + RADAR_PLAYERSTATE_DRIVING, + RADAR_PLAYERSTATE_KEYHOLDER, + RADAR_PLAYERSTATE_PARTNER, + RADAR_GANG_WANTED_1, + RADAR_GANG_WANTED_2, + RADAR_GANG_WANTED_3, + RADAR_GANG_WANTED_4, + RADAR_GANG_WANTED_5, + RADAR_ZTYPE, + RADAR_STINGER, + RADAR_PACKER, + RADAR_MONROE, + RADAR_FAIRGROUND, + RADAR_PROPERTY, + RADAR_GANG_HIGHLIGHT, + RADAR_ALTRUIST, + RADAR_AI, + RADAR_ON_MISSION, + RADAR_CASH_PICKUP, + RADAR_CHOP, + RADAR_DEAD, + RADAR_TERRITORY_LOCKED, + RADAR_CASH_LOST, + RADAR_CASH_VAGOS, + RADAR_CASH_COPS, + RADAR_HOOKER, + RADAR_FRIEND, + RADAR_MISSION_2TO4, + RADAR_MISSION_2TO8, + RADAR_MISSION_2TO12, + RADAR_MISSION_2TO16, + RADAR_CUSTODY_DROPOFF, + RADAR_ONMISSION_COPS, + RADAR_ONMISSION_LOST, + RADAR_ONMISSION_VAGOS, + RADAR_CRIM_CARSTEAL_COPS, + RADAR_CRIM_CARSTEAL_BIKERS, + RADAR_CRIM_CARSTEAL_VAGOS, + RADAR_BAND_STRAND, + RADAR_SIMEON_FAMILY, + RADAR_MISSION_1, + RADAR_MISSION_2, + RADAR_FRIEND_DARTS, + RADAR_FRIEND_COMEDYCLUB, + RADAR_FRIEND_CINEMA, + RADAR_FRIEND_TENNIS, + RADAR_FRIEND_STRIPCLUB, + RADAR_FRIEND_LIVEMUSIC, + RADAR_FRIEND_GOLF, + RADAR_BOUNTY_HIT, + RADAR_UGC_MISSION, + RADAR_HORDE, + RADAR_CRATEDROP, + RADAR_PLANE_DROP, + RADAR_SUB, + RADAR_RACE, + RADAR_DEATHMATCH, + RADAR_ARM_WRESTLING, + RADAR_MISSION_1TO2, + RADAR_SHOOTINGRANGE_GUNSHOP, + RADAR_RACE_AIR, + RADAR_RACE_LAND, + RADAR_RACE_SEA, + RADAR_TOW, + RADAR_GARBAGE, + RADAR_DRILL, + RADAR_SPIKES, + RADAR_FIRETRUCK, + RADAR_MINIGUN2, + RADAR_BUGSTAR, + RADAR_SUBMARINE, + RADAR_CHINOOK, + RADAR_GETAWAY_CAR, + RADAR_MISSION_BIKERS_1, + RADAR_MISSION_BIKERS_1TO2, + RADAR_MISSION_BIKERS_2, + RADAR_MISSION_BIKERS_2TO4, + RADAR_MISSION_BIKERS_2TO8, + RADAR_MISSION_BIKERS_2TO12, + RADAR_MISSION_BIKERS_2TO16, + RADAR_MISSION_COPS_1, + RADAR_MISSION_COPS_1TO2, + RADAR_MISSION_COPS_2, + RADAR_MISSION_COPS_2TO4, + RADAR_MISSION_COPS_2TO8, + RADAR_MISSION_COPS_2TO12, + RADAR_MISSION_COPS_2TO16, + RADAR_MISSION_VAGOS_1, + RADAR_MISSION_VAGOS_1TO2, + RADAR_MISSION_VAGOS_2, + RADAR_MISSION_VAGOS_2TO4, + RADAR_MISSION_VAGOS_2TO8, + RADAR_MISSION_VAGOS_2TO12, + RADAR_MISSION_VAGOS_2TO16, + RADAR_GANG_BIKE, + RADAR_GAS_GRENADE, + RADAR_PROPERTY_FOR_SALE, + RADAR_GANG_ATTACK_PACKAGE, + RADAR_MARTIN_MADRAZZO, + RADAR_ENEMY_HELI_SPIN, + RADAR_BOOST, + RADAR_DEVIN, + RADAR_DOCK, + RADAR_GARAGE, + RADAR_GOLF_FLAG, + RADAR_HANGAR, + RADAR_HELIPAD, + RADAR_JERRY_CAN, + RADAR_MASK, + RADAR_HEIST_PREP, + RADAR_INCAPACITATED, + RADAR_SPAWN_POINT_PICKUP, + RADAR_BOILERSUIT, + RADAR_COMPLETED, + RADAR_ROCKETS, + RADAR_GARAGE_FOR_SALE, + RADAR_HELIPAD_FOR_SALE, + RADAR_DOCK_FOR_SALE, + RADAR_HANGAR_FOR_SALE, + RADAR_PLACEHOLDER_6, + RADAR_BUSINESS, + RADAR_BUSINESS_FOR_SALE, + RADAR_RACE_BIKE, + RADAR_PARACHUTE, + RADAR_TEAM_DEATHMATCH, + RADAR_RACE_FOOT, + RADAR_VEHICLE_DEATHMATCH, + RADAR_BARRY, + RADAR_DOM, + RADAR_MARYANN, + RADAR_CLETUS, + RADAR_JOSH, + RADAR_MINUTE, + RADAR_OMEGA, + RADAR_TONYA, + RADAR_PAPARAZZO, + RADAR_AIM, + RADAR_CRATEDROP_BACKGROUND, + RADAR_GREEN_AND_NET_PLAYER1, + RADAR_GREEN_AND_NET_PLAYER2, + RADAR_GREEN_AND_NET_PLAYER3, + RADAR_GREEN_AND_FRIENDLY, + RADAR_NET_PLAYER1_AND_NET_PLAYER2, + RADAR_NET_PLAYER1_AND_NET_PLAYER3, + RADAR_CREATOR, + RADAR_CREATOR_DIRECTION, + RADAR_ABIGAIL, + RADAR_BLIMP, + RADAR_REPAIR, + RADAR_TESTOSTERONE, + RADAR_DINGHY, + RADAR_FANATIC, + RADAR_INVISIBLE, + RADAR_INFO_ICON, + RADAR_CAPTURE_THE_FLAG, + RADAR_LAST_TEAM_STANDING, + RADAR_BOAT, + RADAR_CAPTURE_THE_FLAG_BASE, + RADAR_MP_CREW_412, + RADAR_CAPTURE_THE_FLAG_OUTLINE, + RADAR_CAPTURE_THE_FLAG_BASE_NOBAG, + RADAR_WEAPON_JERRYCAN, + RADAR_RP, + RADAR_LEVEL_INSIDE, + RADAR_BOUNTY_HIT_INSIDE, + RADAR_CAPTURE_THE_USAFLAG, + RADAR_CAPTURE_THE_USAFLAG_OUTLINE, + RADAR_TANK, + RADAR_PLAYER_HELI, + RADAR_PLAYER_PLANE, + RADAR_PLAYER_JET, + RADAR_CENTRE_STROKE, + RADAR_PLAYER_GUNCAR, + RADAR_PLAYER_BOAT, + RADAR_MP_HEIST, + RADAR_TEMP_1, + RADAR_TEMP_2, + RADAR_TEMP_3, + RADAR_TEMP_4, + RADAR_TEMP_5, + RADAR_TEMP_6, + RADAR_RACE_STUNT, + RADAR_HOT_PROPERTY, + RADAR_URBANWARFARE_VERSUS, + RADAR_KING_OF_THE_CASTLE, + RADAR_PLAYER_KING, + RADAR_DEAD_DROP, + RADAR_PENNED_IN, + RADAR_BEAST, + RADAR_EDGE_POINTER, + RADAR_EDGE_CROSSTHELINE, + RADAR_MP_LAMAR, + RADAR_BENNYS, + RADAR_CORNER_NUMBER_1, + RADAR_CORNER_NUMBER_2, + RADAR_CORNER_NUMBER_3, + RADAR_CORNER_NUMBER_4, + RADAR_CORNER_NUMBER_5, + RADAR_CORNER_NUMBER_6, + RADAR_CORNER_NUMBER_7, + RADAR_CORNER_NUMBER_8, + RADAR_YACHT, + RADAR_FINDERS_KEEPERS, + RADAR_ASSAULT_PACKAGE, + RADAR_HUNT_THE_BOSS, + RADAR_SIGHTSEER, + RADAR_TURRETED_LIMO, + RADAR_BELLY_OF_THE_BEAST, + RADAR_YACHT_LOCATION, + RADAR_PICKUP_BEAST, + RADAR_PICKUP_ZONED, + RADAR_PICKUP_RANDOM, + RADAR_PICKUP_SLOW_TIME, + RADAR_PICKUP_SWAP, + RADAR_PICKUP_THERMAL, + RADAR_PICKUP_WEED, + RADAR_WEAPON_RAILGUN, + RADAR_SEASHARK, + RADAR_PICKUP_HIDDEN, + RADAR_WAREHOUSE, + RADAR_WAREHOUSE_FOR_SALE, + RADAR_OFFICE, + RADAR_OFFICE_FOR_SALE, + RADAR_TRUCK, + RADAR_CONTRABAND, + RADAR_TRAILER, + RADAR_VIP, + RADAR_CARGOBOB, + RADAR_AREA_OUTLINE_BLIP, + RADAR_PICKUP_ACCELERATOR, + RADAR_PICKUP_GHOST, + RADAR_PICKUP_DETONATOR, + RADAR_PICKUP_BOMB, + RADAR_PICKUP_ARMOURED, + RADAR_STUNT, + RADAR_WEAPON_LIVES, + RADAR_STUNT_PREMIUM, + RADAR_ADVERSARY, + RADAR_BIKER_CLUBHOUSE, + RADAR_BIKER_CAGED_IN, + RADAR_BIKER_TURF_WAR, + RADAR_BIKER_JOUST, + RADAR_PRODUCTION_WEED, + RADAR_PRODUCTION_CRACK, + RADAR_PRODUCTION_FAKE_ID, + RADAR_PRODUCTION_METH, + RADAR_PRODUCTION_MONEY, + RADAR_PACKAGE, + RADAR_CAPTURE_1, + RADAR_CAPTURE_2, + RADAR_CAPTURE_3, + RADAR_CAPTURE_4, + RADAR_CAPTURE_5, + RADAR_CAPTURE_6, + RADAR_CAPTURE_7, + RADAR_CAPTURE_8, + RADAR_CAPTURE_9, + RADAR_CAPTURE_10, + RADAR_QUAD, + RADAR_BUS, + RADAR_DRUGS_PACKAGE, + RADAR_PICKUP_JUMP, + RADAR_ADVERSARY_4, + RADAR_ADVERSARY_8, + RADAR_ADVERSARY_10, + RADAR_ADVERSARY_12, + RADAR_ADVERSARY_16, + RADAR_LAPTOP, + RADAR_PICKUP_DEADLINE, + RADAR_SPORTS_CAR, + RADAR_WAREHOUSE_VEHICLE, + RADAR_REG_PAPERS, + RADAR_POLICE_STATION_DROPOFF, + RADAR_JUNKYARD, + RADAR_EX_VECH_1, + RADAR_EX_VECH_2, + RADAR_EX_VECH_3, + RADAR_EX_VECH_4, + RADAR_EX_VECH_5, + RADAR_EX_VECH_6, + RADAR_EX_VECH_7, + RADAR_TARGET_A, + RADAR_TARGET_B, + RADAR_TARGET_C, + RADAR_TARGET_D, + RADAR_TARGET_E, + RADAR_TARGET_F, + RADAR_TARGET_G, + RADAR_TARGET_H, + RADAR_JUGG, + RADAR_PICKUP_REPAIR, + RADAR_STEERINGWHEEL, + RADAR_TROPHY, + RADAR_PICKUP_ROCKET_BOOST, + RADAR_PICKUP_HOMING_ROCKET, + RADAR_PICKUP_MACHINEGUN, + RADAR_PICKUP_PARACHUTE, + RADAR_PICKUP_TIME_5, + RADAR_PICKUP_TIME_10, + RADAR_PICKUP_TIME_15, + RADAR_PICKUP_TIME_20, + RADAR_PICKUP_TIME_30, + RADAR_SUPPLIES, + RADAR_PROPERTY_BUNKER, + RADAR_GR_WVM_1, + RADAR_GR_WVM_2, + RADAR_GR_WVM_3, + RADAR_GR_WVM_4, + RADAR_GR_WVM_5, + RADAR_GR_WVM_6, + RADAR_GR_COVERT_OPS, + RADAR_ADVERSARY_BUNKER, + RADAR_GR_MOC_UPGRADE, + RADAR_GR_W_UPGRADE, + RADAR_SM_CARGO, + RADAR_SM_HANGAR, + RADAR_TF_CHECKPOINT, + RADAR_RACE_TF, + RADAR_SM_WP1, + RADAR_SM_WP2, + RADAR_SM_WP3, + RADAR_SM_WP4, + RADAR_SM_WP5, + RADAR_SM_WP6, + RADAR_SM_WP7, + RADAR_SM_WP8, + RADAR_SM_WP9, + RADAR_SM_WP10, + RADAR_SM_WP11, + RADAR_SM_WP12, + RADAR_SM_WP13, + RADAR_SM_WP14, + RADAR_NHP_BAG, + RADAR_NHP_CHEST, + RADAR_NHP_ORBIT, + RADAR_NHP_VEH1, + RADAR_NHP_BASE, + RADAR_NHP_OVERLAY, + RADAR_NHP_TURRET, + RADAR_NHP_MG_FIREWALL, + RADAR_NHP_MG_NODE, + RADAR_NHP_WP1, + RADAR_NHP_WP2, + RADAR_NHP_WP3, + RADAR_NHP_WP4, + RADAR_NHP_WP5, + RADAR_NHP_WP6, + RADAR_NHP_WP7, + RADAR_NHP_WP8, + RADAR_NHP_WP9, + RADAR_NHP_CCTV, + RADAR_NHP_STARTERPACK, + RADAR_NHP_TURRET_CONSOLE, + RADAR_NHP_MG_MIR_ROTATE, + RADAR_NHP_MG_MIR_STATIC, + RADAR_NHP_MG_PROXY, + RADAR_ACSR_RACE_TARGET, + RADAR_ACSR_RACE_HOTRING, + RADAR_ACSR_WP1, + RADAR_ACSR_WP2, + RADAR_BAT_CLUB_PROPERTY, + RADAR_BAT_CARGO, + RADAR_BAT_TRUCK, + RADAR_BAT_HACK_JEWEL, + RADAR_BAT_HACK_GOLD, + RADAR_BAT_KEYPAD, + RADAR_BAT_HACK_TARGET, + RADAR_PICKUP_DTB_HEALTH, + RADAR_PICKUP_DTB_BLAST_INCREASE, + RADAR_PICKUP_DTB_BLAST_DECREASE, + RADAR_PICKUP_DTB_BOMB_INCREASE, + RADAR_PICKUP_DTB_BOMB_DECREASE, + RADAR_BAT_RIVAL_CLUB, + RADAR_BAT_DRONE, + RADAR_BAT_CASH_REG, + RADAR_CCTV, + RADAR_BAT_ASSASSINATE, + RADAR_BAT_PBUS, + RADAR_BAT_WP1, + RADAR_BAT_WP2, + RADAR_BAT_WP3, + RADAR_BAT_WP4, + RADAR_BAT_WP5, + RADAR_BAT_WP6, + RADAR_BLIMP_2, + RADAR_OPPRESSOR_2, + RADAR_BAT_WP7, + RADAR_ARENA_SERIES, + RADAR_ARENA_PREMIUM, + RADAR_ARENA_WORKSHOP, + RADAR_RACE_WARS, + RADAR_ARENA_TURRET, + RADAR_ARENA_RC_CAR, + RADAR_ARENA_RC_WORKSHOP, + RADAR_ARENA_TRAP_FIRE, + RADAR_ARENA_TRAP_FLIP, + RADAR_ARENA_TRAP_SEA, + RADAR_ARENA_TRAP_TURN, + RADAR_ARENA_TRAP_PIT, + RADAR_ARENA_TRAP_MINE, + RADAR_ARENA_TRAP_BOMB, + RADAR_ARENA_TRAP_WALL, + RADAR_ARENA_TRAP_BRD, + RADAR_ARENA_TRAP_SBRD, + RADAR_ARENA_BRUISER, + RADAR_ARENA_BRUTUS, + RADAR_ARENA_CERBERUS, + RADAR_ARENA_DEATHBIKE, + RADAR_ARENA_DOMINATOR, + RADAR_ARENA_IMPALER, + RADAR_ARENA_IMPERATOR, + RADAR_ARENA_ISSI, + RADAR_ARENA_SASQUATCH, + RADAR_ARENA_SCARAB, + RADAR_ARENA_SLAMVAN, + RADAR_ARENA_ZR380, + RADAR_AP, + RADAR_COMIC_STORE, + RADAR_COP_CAR, + RADAR_RC_TIME_TRIALS, + RADAR_KING_OF_THE_HILL, + RADAR_KING_OF_THE_HILL_TEAMS, + RADAR_RUCKSACK, + RADAR_SHIPPING_CONTAINER, + RADAR_AGATHA, + RADAR_CASINO, + RADAR_CASINO_TABLE_GAMES, + RADAR_CASINO_WHEEL, + RADAR_CASINO_CONCIERGE, + RADAR_CASINO_CHIPS, + RADAR_CASINO_HORSE_RACING, + RADAR_ADVERSARY_FEATURED, + RADAR_ROULETTE_1, + RADAR_ROULETTE_2, + RADAR_ROULETTE_3, + RADAR_ROULETTE_4, + RADAR_ROULETTE_5, + RADAR_ROULETTE_6, + RADAR_ROULETTE_7, + RADAR_ROULETTE_8, + RADAR_ROULETTE_9, + RADAR_ROULETTE_10, + RADAR_ROULETTE_11, + RADAR_ROULETTE_12, + RADAR_ROULETTE_13, + RADAR_ROULETTE_14, + RADAR_ROULETTE_15, + RADAR_ROULETTE_16, + RADAR_ROULETTE_17, + RADAR_ROULETTE_18, + RADAR_ROULETTE_19, + RADAR_ROULETTE_20, + RADAR_ROULETTE_21, + RADAR_ROULETTE_22, + RADAR_ROULETTE_23, + RADAR_ROULETTE_24, + RADAR_ROULETTE_25, + RADAR_ROULETTE_26, + RADAR_ROULETTE_27, + RADAR_ROULETTE_28, + RADAR_ROULETTE_29, + RADAR_ROULETTE_30, + RADAR_ROULETTE_31, + RADAR_ROULETTE_32, + RADAR_ROULETTE_33, + RADAR_ROULETTE_34, + RADAR_ROULETTE_35, + RADAR_ROULETTE_36, + RADAR_ROULETTE_0, + RADAR_ROULETTE_00, + RADAR_LIMO, + RADAR_WEAPON_ALIEN, + RADAR_RACE_OPEN_WHEEL, + RADAR_RAPPEL, + RADAR_SWAP_CAR, + RADAR_SCUBA_GEAR, + RADAR_CPANEL_1, + RADAR_CPANEL_2, + RADAR_CPANEL_3, + RADAR_CPANEL_4, + RADAR_SNOW_TRUCK, + RADAR_BUGGY_1, + RADAR_BUGGY_2, + RADAR_ZHABA, + RADAR_GERALD, + RADAR_RON, + RADAR_ARCADE, + RADAR_DRONE_CONTROLS, + RADAR_RC_TANK, + RADAR_STAIRS, + RADAR_CAMERA_2, + RADAR_WINKY, + RADAR_MINI_SUB, + RADAR_KART_RETRO, + RADAR_KART_MODERN, + RADAR_MILITARY_QUAD, + RADAR_MILITARY_TRUCK, + RADAR_SHIP_WHEEL, + RADAR_UFO, + RADAR_SEASPARROW2, + RADAR_DINGHY2, + RADAR_PATROL_BOAT, + RADAR_RETRO_SPORTS_CAR, + RADAR_SQUADEE, + RADAR_FOLDING_WING_JET, + RADAR_VALKYRIE2, + RADAR_SUB2, + RADAR_BOLT_CUTTERS, + RADAR_RAPPEL_GEAR, + RADAR_KEYCARD, + RADAR_PASSWORD, + RADAR_ISLAND_HEIST_PREP, + RADAR_ISLAND_PARTY, + RADAR_CONTROL_TOWER, + RADAR_UNDERWATER_GATE, + RADAR_POWER_SWITCH, + RADAR_COMPOUND_GATE, + RADAR_RAPPEL_POINT, + RADAR_KEYPAD, + RADAR_SUB_CONTROLS, + RADAR_SUB_PERISCOPE, + RADAR_SUB_MISSILE, + RADAR_PAINTING, + RADAR_CAR_MEET, + RADAR_CAR_TEST_AREA, + RADAR_AUTO_SHOP_PROPERTY, + RADAR_DOCKS_EXPORT, + RADAR_PRIZE_CAR, + RADAR_TEST_CAR, + RADAR_CAR_ROBBERY_BOARD, + RADAR_CAR_ROBBERY_PREP, + RADAR_STREET_RACE_SERIES, + RADAR_PURSUIT_SERIES, + RADAR_CAR_MEET_ORGANISER, + RADAR_SECUROSERV, + RADAR_BOUNTY_COLLECTIBLES, + RADAR_MOVIE_COLLECTIBLES, + RADAR_TRAILER_RAMP, + RADAR_RACE_ORGANISER, + RADAR_CHALKBOARD_LIST, + RADAR_EXPORT_VEHICLE, + RADAR_TRAIN, + RADAR_HEIST_DIAMOND, + RADAR_HEIST_DOOMSDAY, + RADAR_HEIST_ISLAND, + RADAR_SLAMVAN2, + RADAR_CRUSADER, + RADAR_CONSTRUCTION_OUTFIT, + RADAR_OVERLAY_JAMMED, + RADAR_HEIST_ISLAND_UNAVAILABLE, + RADAR_HEIST_DIAMOND_UNAVAILABLE, + RADAR_HEIST_DOOMSDAY_UNAVAILABLE, + RADAR_PLACEHOLDER_7, + RADAR_PLACEHOLDER_8, + RADAR_PLACEHOLDER_9, + RADAR_FEATURED_SERIES, + RADAR_VEHICLE_FOR_SALE, + RADAR_VAN_KEYS, + RADAR_SUV_SERVICE, + RADAR_SECURITY_CONTRACT, + RADAR_SAFE, + RADAR_PED_R, + RADAR_PED_E, + RADAR_PAYPHONE, + RADAR_PATRIOT3, + RADAR_MUSIC_STUDIO, + RADAR_JUBILEE, + RADAR_GRANGER2, + RADAR_EXPLOSIVE_CHARGE, + RADAR_DEITY, + RADAR_D_CHAMPION, + RADAR_BUFFALO4, + RADAR_AGENCY, + RADAR_BIKER_BAR, + RADAR_SIMEON_OVERLAY, + RADAR_JUNK_SKYDIVE, + RADAR_LUXURY_CAR_SHOWROOM, + RADAR_CAR_SHOWROOM, + RADAR_CAR_SHOWROOM_SIMEON, + RADAR_FLAMING_SKULL, + RADAR_WEAPON_AMMO, + RADAR_COMMUNITY_SERIES, + RADAR_CAYO_SERIES, + RADAR_CLUBHOUSE_CONTRACT, + RADAR_AGENT_ULP, + RADAR_ACID, + RADAR_ACID_LAB, + RADAR_DAX_OVERLAY, + RADAR_DEAD_DROP_PACKAGE, + RADAR_DOWNTOWN_CAB, + RADAR_GUN_VAN, + RADAR_STASH_HOUSE, + RADAR_TRACTOR, + RADAR_WAREHOUSE_JUGGALO, + RADAR_WAREHOUSE_JUGGALO_DAX, + RADAR_WEAPON_CROWBAR, + RADAR_DUFFEL_BAG, + RADAR_OIL_TANKER, + RADAR_ACID_LAB_TENT, + RADAR_VAN_BURRITO, + RADAR_ACID_BOOST, + RADAR_PED_GANG_LEADER, + RADAR_MULTISTOREY_GARAGE, + RADAR_SEIZED_ASSET_SALES, + RADAR_CAYO_ATTRITION, + RADAR_BICYCLE, + RADAR_BICYCLE_TRIAL, + RADAR_RAIJU, + RADAR_CONADA2, + RADAR_OVERLAY_READY_FOR_SELL, + RADAR_OVERLAY_MISSING_SUPPLIES, + RADAR_STREAMER216, + RADAR_SIGNAL_JAMMER, + RADAR_SALVAGE_YARD, + RADAR_ROBBERY_PREP_EQUIPMENT, + RADAR_ROBBERY_PREP_OVERLAY, + RADAR_YUSUF, + RADAR_VINCENT, + RADAR_VINEWOOD_GARAGE, + RADAR_LSTB, + RADAR_CCTV_WORKSTATION, + RADAR_HACKING_DEVICE, + RADAR_RACE_DRAG, + RADAR_RACE_DRIFT, + RADAR_CASINO_PREP, + RADAR_PLANNING_WALL, + RADAR_WEAPON_CRATE, + RADAR_WEAPON_SNOWBALL, + RADAR_TRAIN_SIGNALS_GREEN, + RADAR_TRAIN_SIGNALS_RED, }; enum class BlipColors diff --git a/src/util/blip.cpp b/src/util/blip.cpp index 686f91d3..4a098a09 100644 --- a/src/util/blip.cpp +++ b/src/util/blip.cpp @@ -50,19 +50,17 @@ namespace big::blip bool get_objective_location(Vector3& location) { - if (get_objective_location_iteration(location, {BlipIcons::Circle}, {BlipColors::YellowMission, BlipColors::YellowMission2, BlipColors::Mission})) + if (get_objective_location_iteration(location, {BlipIcons::RADAR_LEVEL}, {BlipColors::YellowMission, BlipColors::YellowMission2, BlipColors::Mission})) return true; - if (get_objective_location_iteration(location, {BlipIcons::RaceFinish}, {BlipColors::None})) + if (get_objective_location_iteration(location, {BlipIcons::RADAR_RACEFLAG}, {BlipColors::None})) return true; - if (get_objective_location_iteration(location, {BlipIcons::Circle}, {BlipColors::Green, BlipColors::Blue})) - return true; - if (get_objective_location_iteration(location, {BlipIcons::CrateDrop})) + if (get_objective_location_iteration(location, {BlipIcons::RADAR_LEVEL}, {BlipColors::Green, BlipColors::Blue})) return true; - auto blip_icons = {0, 1, 2, 143, 144, 145, 146, 280, 502, 503, 504, 505, 506, 507, 508, 509, 510, 511, 535, 536, 537, 538, 539, 540, 541, 542}; - for (const auto& icon : blip_icons) + static const auto blip_icons = {BlipIcons::RADAR_OBJECTIVE_BLUE, BlipIcons::RADAR_OBJECTIVE_GREEN, BlipIcons::RADAR_OBJECTIVE_RED, BlipIcons::RADAR_OBJECTIVE_YELLOW, BlipIcons::RADAR_CRATEDROP, BlipIcons::RADAR_TARGET_A, BlipIcons::RADAR_TARGET_B, BlipIcons::RADAR_TARGET_C, BlipIcons::RADAR_TARGET_D, BlipIcons::RADAR_TARGET_E, BlipIcons::RADAR_TARGET_F, BlipIcons::RADAR_TARGET_G, BlipIcons::RADAR_TARGET_H, BlipIcons::RADAR_SM_CARGO, BlipIcons::RADAR_BAT_CARGO, BlipIcons::RADAR_DEAD_DROP_PACKAGE}; + for (const auto icon : blip_icons) { - if (get_blip_location_from_offset(location, icon)) + if (get_blip_location_from_offset(location, (int)icon)) return true; } diff --git a/src/util/teleport.hpp b/src/util/teleport.hpp index 4bfd37d5..390e6419 100644 --- a/src/util/teleport.hpp +++ b/src/util/teleport.hpp @@ -169,7 +169,7 @@ namespace big::teleport if (!blip::get_blip_location(location, sprite, color)) return false; - if (sprite == (int)BlipIcons::Waypoint) + if (sprite == (int)BlipIcons::RADAR_WAYPOINT) entity::load_ground_at_3dcoord(location); to_coords(location); @@ -193,7 +193,7 @@ namespace big::teleport inline bool to_waypoint() { - if (!to_blip((int)BlipIcons::Waypoint)) + if (!to_blip((int)BlipIcons::RADAR_WAYPOINT)) { g_notification_service.push_warning("TELEPORT"_T.data(), "TELEPORT_NO_WAYPOINT_SET"_T.data()); diff --git a/src/views/players/player/player_teleport.cpp b/src/views/players/player/player_teleport.cpp index aeda153b..bc462f02 100644 --- a/src/views/players/player/player_teleport.cpp +++ b/src/views/players/player/player_teleport.cpp @@ -18,7 +18,7 @@ namespace big ImGui::SameLine(); components::button("VIEW_PLAYER_TELEPORT_YOUR_WAYPOINT"_T, [] { Vector3 location; - if (blip::get_blip_location(location, (int)BlipIcons::Waypoint)) + if (blip::get_blip_location(location, (int)BlipIcons::RADAR_WAYPOINT)) entity::load_ground_at_3dcoord(location), teleport::teleport_player_to_coords(g_player_service->get_selected(), location); });