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

Hotfix (#3072)

Browse Source
This commit is contained in:
R.K 2024-05-09 02:06:25 -07:00 committed by GitHub
parent 29f226b316
commit 01f784de18
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/backend/looped/self/wanted_level.cpp
View File

@ -26,7 +26,7 @@ namespace big
}
};
clear_wanted g_clear_wanted("clearwanted", "CLEAR_WANTED_LEVEL", "CLEAR_WANTED_LEVEL_DESC_SELF", 0);
clear_wanted g_clear_wanted("clearwantedself", "CLEAR_WANTED_LEVEL", "CLEAR_WANTED_LEVEL_DESC_SELF", 0);
class never_wanted : looped_command
{
@ -39,10 +39,7 @@ namespace big
g_local_player->m_player_info->m_is_wanted = false;
// Since we're hiding the force wanted checkbox and wanted slider, we don't need to do anything else
}
virtual void on_disable() override
{
// If we turn off never wanted, be sure to disable force wanted to restore to a "default" setting
g.self.wanted_level = 0;
g.self.force_wanted_level = false;
}
};

2
src/services/hotkey/hotkey_service.cpp
View File

@ -14,7 +14,7 @@ namespace big
// ordered alphabetically to more easily see if a certain hotkey is present
register_hotkey("beastjump", g.settings.hotkeys.beastjump, "beastjump"_J);
register_hotkey("bringpv", g.settings.hotkeys.bringvehicle, "bringpv"_J);
register_hotkey("clearwantedlvl", g.settings.hotkeys.clear_wanted, "clearwantedlvl"_J);
register_hotkey("clearwantedself", g.settings.hotkeys.clear_wanted, "clearwantedself"_J);
register_hotkey("cmdexecutor", g.settings.hotkeys.cmd_excecutor, "cmdexecutor"_J);
register_hotkey("fastquit", g.settings.hotkeys.fast_quit, "fastquit"_J);
register_hotkey("fastrun", g.settings.hotkeys.superrun, "fastrun"_J);

2
src/views/self/view_self.cpp
View File

@ -218,7 +218,7 @@ namespace big
if (!g.self.never_wanted)
{
ImGui::SameLine();
components::command_button<"clearwanted">();
components::command_button<"clearwantedself">();
// Most ImGui widgets return true when they've been changed, so this is useful to prevent us from overwriting the wanted level's natural decay/progression if we're not keeping it locked
ImGui::SetNextItemWidth(200);

2
src/views/settings/view_hotkey_settings.cpp
View File

@ -59,7 +59,7 @@ namespace big
if (ImGui::Hotkey("VIEW_HOTKEY_SETTINGS_TOGGLE_VEHICLE_FLY"_T.data(), &g.settings.hotkeys.vehicle_flymode))
g_hotkey_service->update_hotkey("vehiclefly", g.settings.hotkeys.vehicle_flymode);
if (ImGui::Hotkey("CLEAR_WANTED_LEVEL"_T.data(), &g.settings.hotkeys.clear_wanted))
g_hotkey_service->update_hotkey("clearwantedlvl", g.settings.hotkeys.clear_wanted);
g_hotkey_service->update_hotkey("clearwantedself", g.settings.hotkeys.clear_wanted);
ImGui::PopItemWidth();
}