ModdingRX/YimMenu
Archived
1
0
Fork 0
Code Actions Releases Activity

Removed errant waypoint icons in get_objective_location. (#3509)
Some checks are pending
Nightly Build / Build Nightly (push) Waiting to run
Details
Nightly Build / Recreate Release (push) Blocked by required conditions
Details
Nightly Build / Check Recent Commit (push) Successful in 27s
Details

Browse Source
This commit is contained in:
gir489 2024-08-03 12:19:43 -04:00 committed by GitHub
parent 09a60a98b7
commit eefd71196c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 1121 additions and 700 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/backend/looped/system/auto_tp_to_waypoint.cpp
View File

@ -10,7 +10,7 @@ namespace big
virtual void on_tick() override virtual void on_tick() override
{ {
teleport::to_blip((int)BlipIcons::Waypoint); teleport::to_blip((int)BlipIcons::RADAR_WAYPOINT);
} }
}; };

2
src/backend/looped/vehicle/auto_drive.cpp
View File

@ -52,7 +52,7 @@ namespace big
else if (current_destination == AutoDriveDestination::WAYPOINT) else if (current_destination == AutoDriveDestination::WAYPOINT)
{ {
to_waypoint = true; to_waypoint = true;
does_waypoint_exist = blip::get_blip_location(waypoint, (int)BlipIcons::Waypoint); does_waypoint_exist = blip::get_blip_location(waypoint, (int)BlipIcons::RADAR_WAYPOINT);
} }
if (does_waypoint_exist if (does_waypoint_exist

2
src/backend/looped/world/beacon.cpp
View File

@ -13,7 +13,7 @@ namespace big
{ {
Vector3 location; Vector3 location;
if (blip::get_blip_location(location, (int)BlipIcons::Waypoint)) if (blip::get_blip_location(location, (int)BlipIcons::RADAR_WAYPOINT))
{ {
int color[3] = {0, 0, 0}; int color[3] = {0, 0, 0};

1337
src/gta/enums.hpp
View File

File diff suppressed because it is too large Load Diff

14
src/util/blip.cpp
View File

@ -50,19 +50,17 @@ namespace big::blip
bool get_objective_location(Vector3& location) 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; 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; return true;
if (get_objective_location_iteration(location, {BlipIcons::Circle}, {BlipColors::Green, BlipColors::Blue})) if (get_objective_location_iteration(location, {BlipIcons::RADAR_LEVEL}, {BlipColors::Green, BlipColors::Blue}))
return true;
if (get_objective_location_iteration(location, {BlipIcons::CrateDrop}))
return true; 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}; 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) 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; return true;
} }

4
src/util/teleport.hpp
View File

@ -169,7 +169,7 @@ namespace big::teleport
if (!blip::get_blip_location(location, sprite, color)) if (!blip::get_blip_location(location, sprite, color))
return false; return false;
if (sprite == (int)BlipIcons::Waypoint) if (sprite == (int)BlipIcons::RADAR_WAYPOINT)
entity::load_ground_at_3dcoord(location); entity::load_ground_at_3dcoord(location);
to_coords(location); to_coords(location);
@ -193,7 +193,7 @@ namespace big::teleport
inline bool to_waypoint() 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()); g_notification_service.push_warning("TELEPORT"_T.data(), "TELEPORT_NO_WAYPOINT_SET"_T.data());

2
src/views/players/player/player_teleport.cpp
View File

@ -18,7 +18,7 @@ namespace big
ImGui::SameLine(); ImGui::SameLine();
components::button("VIEW_PLAYER_TELEPORT_YOUR_WAYPOINT"_T, [] { components::button("VIEW_PLAYER_TELEPORT_YOUR_WAYPOINT"_T, [] {
Vector3 location; 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); entity::load_ground_at_3dcoord(location), teleport::teleport_player_to_coords(g_player_service->get_selected(), location);
}); });