ModdingRX/TmpMenu
1
0
Fork 0
mirror of https://github.com/Mr-X-GTA/YimMenu.git synced 2024-12-22 20:17:24 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

P2905R2 Fix - Refactor rvalue arguments into lvalues for std::make_format_args (#3194)

Browse Source 
Co-authored-by: xiaoxiao921 <837334+xiaoxiao921@users.noreply.github.com>
This commit is contained in:
R.K 2024-05-29 10:50:59 -07:00 committed by GitHub
parent 84aae84b36
commit dcf50fffa8
11 changed files with 47 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmake/async-logger.cmake
View File

@ -1,10 +1,12 @@
include(FetchContent) include(FetchContent)
add_compile_definitions(CXX_FORMAT_SUPPORT)
message("AsyncLogger") message("AsyncLogger")
FetchContent_Declare( FetchContent_Declare(
AsyncLogger AsyncLogger
GIT_REPOSITORY https://github.com/Yimura/AsyncLogger.git GIT_REPOSITORY https://github.com/Yimura/AsyncLogger.git
GIT_TAG v0.0.6 GIT_TAG 80ce938277acd44767f858099920ae20f1df42ca
GIT_PROGRESS TRUE GIT_PROGRESS TRUE
) )
FetchContent_MakeAvailable(AsyncLogger) FetchContent_MakeAvailable(AsyncLogger)

5
src/backend/reactions/interloper_reaction.cpp
View File

@ -41,8 +41,11 @@ namespace big
if (notify) if (notify)
{ {
auto a_name = attacker->get_name();
auto v_name = victim->get_name();
g_notification_service.push_warning("PROTECTIONS"_T.data(), g_notification_service.push_warning("PROTECTIONS"_T.data(),
std::vformat(g_translation_service.get_translation(m_notify_message), std::make_format_args(attacker->get_name(), victim->get_name()))); std::vformat(g_translation_service.get_translation(m_notify_message), std::make_format_args(a_name, v_name)));
} }
process_common(attacker); process_common(attacker);

13
src/backend/reactions/reaction.cpp
View File

@ -61,17 +61,20 @@ namespace big
if (announce_in_chat) if (announce_in_chat)
{ {
auto p_name = player->get_name();
auto msg = std::format("{} {}", auto msg = std::format("{} {}",
g.session.chat_output_prefix, g.session.chat_output_prefix, std::vformat(g_translation_service.get_translation(m_announce_message), std::make_format_args(p_name)));
std::vformat(g_translation_service.get_translation(m_announce_message), std::make_format_args(player->get_name())));
chat::send_message(msg); chat::send_message(msg);
} }
if (notify) if (notify)
{ {
auto p_name = player->get_name();
g_notification_service.push_warning("PROTECTIONS"_T.data(), g_notification_service.push_warning("PROTECTIONS"_T.data(),
std::vformat(g_translation_service.get_translation(m_notify_message), std::make_format_args(player->get_name()))); std::vformat(g_translation_service.get_translation(m_notify_message), std::make_format_args(p_name)));
} }
process_common(player); process_common(player);
@ -93,9 +96,11 @@ namespace big
if (notify) if (notify)
{ {
auto p_name = player->get_name();
// Use a different notification since the default start_script reaction is "Blocked Start Script" // Use a different notification since the default start_script reaction is "Blocked Start Script"
g_notification_service.push_warning("PROTECTIONS"_T.data(), g_notification_service.push_warning("PROTECTIONS"_T.data(),
std::vformat("REACTION_START_SCRIPT_ALLOWED"_T.data(), std::make_format_args(player->get_name()))); std::vformat("REACTION_START_SCRIPT_ALLOWED"_T.data(), std::make_format_args(p_name)));
} }
} }
} }

10
src/hooks/protections/receive_net_message.cpp
View File

@ -163,8 +163,9 @@ namespace big
if (player->m_host_migration_rate_limit.exceeded_last_process()) if (player->m_host_migration_rate_limit.exceeded_last_process())
{ {
session::add_infraction(player, Infraction::TRIED_KICK_PLAYER); session::add_infraction(player, Infraction::TRIED_KICK_PLAYER);
g_notification_service.push_error("PROTECTIONS"_T.data(), auto p_name = player->get_name();
std::vformat("OOM_KICK"_T, std::make_format_args(player->get_name())));
g_notification_service.push_error("PROTECTIONS"_T.data(), std::vformat("OOM_KICK"_T, std::make_format_args(p_name)));
} }
return true; return true;
} }
@ -222,8 +223,9 @@ namespace big
if (player->m_radio_request_rate_limit.exceeded_last_process()) if (player->m_radio_request_rate_limit.exceeded_last_process())
{ {
session::add_infraction(player, Infraction::TRIED_KICK_PLAYER); session::add_infraction(player, Infraction::TRIED_KICK_PLAYER);
g_notification_service.push_error("PROTECTIONS"_T.data(), auto p_name = player->get_name();
std::vformat("OOM_KICK"_T, std::make_format_args(player->get_name())));
g_notification_service.push_error("PROTECTIONS"_T.data(), std::vformat("OOM_KICK"_T, std::make_format_args(p_name)));
player->block_radio_requests = true; player->block_radio_requests = true;
} }
return true; return true;

6
src/hooks/protections/received_event.cpp
View File

@ -370,10 +370,12 @@ namespace big
&& player->m_player_info->m_ped && player->m_player_info->m_ped->m_net_object && player->m_player_info->m_ped && player->m_player_info->m_ped->m_net_object
&& ownerNetId != player->m_player_info->m_ped->m_net_object->m_object_id && !offset_object) && ownerNetId != player->m_player_info->m_ped->m_net_object->m_object_id && !offset_object)
{ {
auto p_name = player->get_name();
auto m_name = reinterpret_cast<CPed*>(entity)->m_player_info->m_net_player_data.m_name;
g_notification_service.push_error("WARNING"_T.data(), g_notification_service.push_error("WARNING"_T.data(),
std::vformat("BLAMED_FOR_EXPLOSION"_T, std::vformat("BLAMED_FOR_EXPLOSION"_T,
std::make_format_args(player->get_name(), std::make_format_args(p_name, m_name)));
reinterpret_cast<CPed*>(entity)->m_player_info->m_net_player_data.m_name)));
// too many false positives, disabling it // too many false positives, disabling it
//session::add_infraction(g_player_service->get_by_id(player->m_player_id), Infraction::BLAME_EXPLOSION_DETECTED); //session::add_infraction(g_player_service->get_by_id(player->m_player_id), Infraction::BLAME_EXPLOSION_DETECTED);
return; return;

4
src/hooks/protections/send_non_physical_player_data.cpp
View File

@ -15,8 +15,10 @@ namespace big
if (plyr && plyr->block_join && *g_pointers->m_gta.m_is_session_started) if (plyr && plyr->block_join && *g_pointers->m_gta.m_is_session_started)
{ {
auto p_name = plyr->get_name();
data->m_bubble_id = 10; data->m_bubble_id = 10;
g_notification_service.push("BLOCK_JOIN"_T.data(), std::vformat("BLOCK_JOIN_PREVENT_PLAYER_JOIN"_T, std::make_format_args(plyr->get_name()))); g_notification_service.push("BLOCK_JOIN"_T.data(), std::vformat("BLOCK_JOIN_PREVENT_PLAYER_JOIN"_T, std::make_format_args(p_name)));
} }
bool result = g_hooking->get_original<hooks::send_non_physical_player_data>()(player, message, flags, a4, a5); bool result = g_hooking->get_original<hooks::send_non_physical_player_data>()(player, message, flags, a4, a5);

4
src/util/notify.cpp
View File

@ -37,7 +37,9 @@ namespace big::notify
if (g.reactions.crash.announce_in_chat) if (g.reactions.crash.announce_in_chat)
{ {
auto msg = std::vformat("NOTIFICATION_CRASH_TYPE_BLOCKED"_T, std::make_format_args(player->get_name(), crash)); auto p_name = player->get_name();
auto msg = std::vformat("NOTIFICATION_CRASH_TYPE_BLOCKED"_T, std::make_format_args(p_name, crash));
msg = std::format("{} {}", g.session.chat_output_prefix, msg); msg = std::format("{} {}", g.session.chat_output_prefix, msg);
chat::send_message(msg); chat::send_message(msg);

12
src/views/core/view_cmd_executor.cpp
View File

@ -49,12 +49,12 @@ namespace big
{ {
for (auto cmd : possible_commands) for (auto cmd : possible_commands)
{ {
ImGui::Text(std::vformat("CMD_EXECUTOR_CMD_TEMPLATE"_T, auto cmd_name = cmd->get_name();
std::make_format_args(cmd->get_name(), auto cmd_label = cmd->get_label();
cmd->get_label(), auto cmd_description = cmd->get_description();
cmd->get_description(), auto cmd_num_args = cmd->get_num_args() ? cmd->get_num_args().value() : 0;
cmd->get_num_args() ? cmd->get_num_args().value() : 0))
.data()); ImGui::Text(std::vformat("CMD_EXECUTOR_CMD_TEMPLATE"_T, std::make_format_args(cmd_name, cmd_label, cmd_description, cmd_num_args)).data());
// check if we aren't on the last iteration // check if we aren't on the last iteration
if (cmd != possible_commands.back()) if (cmd != possible_commands.back())

6
src/views/self/view_mobile.cpp
View File

@ -59,10 +59,10 @@ namespace big
components::button("MORS_FIX_ALL"_T, [] { components::button("MORS_FIX_ALL"_T, [] {
int amount_fixed = mobile::mors_mutual::fix_all(); int amount_fixed = mobile::mors_mutual::fix_all();
auto v_fixed = amount_fixed == 1 ? "VEHICLE_FIX_HAS"_T.data() : "VEHICLE_FIX_HAVE"_T.data();
g_notification_service.push_success("MOBILE"_T.data(), g_notification_service.push_success("MOBILE"_T.data(),
std::vformat("VEHICLE_FIX_AMOUNT"_T, std::vformat("VEHICLE_FIX_AMOUNT"_T, std::make_format_args(amount_fixed, v_fixed)));
std::make_format_args(amount_fixed,
amount_fixed == 1 ? "VEHICLE_FIX_HAS"_T.data() : "VEHICLE_FIX_HAVE"_T.data())));
}); });
} }
} }

4
src/views/self/view_teleport.cpp
View File

@ -162,7 +162,9 @@ namespace big
ImGui::Spacing(); ImGui::Spacing();
components::small_text("IPL_INFOS"_T); components::small_text("IPL_INFOS"_T);
ImGui::Text(std::vformat("IPL_CNT"_T, std::make_format_args(ipls[current_select].ipl_names.size())).data()); auto ipls_data = ipls[current_select].ipl_names.size();
ImGui::Text(std::vformat("IPL_CNT"_T, std::make_format_args(ipls_data)).data());
ImGui::Text(std::vformat("IPL_POSITION"_T, std::make_format_args(ipls[current_select].location.x, ipls[current_select].location.y, ipls[current_select].location.z)).data()); ImGui::Text(std::vformat("IPL_POSITION"_T, std::make_format_args(ipls[current_select].location.x, ipls[current_select].location.y, ipls[current_select].location.z)).data());
} }
} }

5
src/views/vehicle/view_vehicle.cpp
View File

@ -10,10 +10,11 @@ namespace big
{ {
components::button("MORS_FIX_ALL"_T, [] { components::button("MORS_FIX_ALL"_T, [] {
int amount_fixed = mobile::mors_mutual::fix_all(); int amount_fixed = mobile::mors_mutual::fix_all();
auto v_fixed = amount_fixed == 1 ? "VEHICLE_FIX_HAS"_T.data() : "VEHICLE_FIX_HAVE"_T.data();
g_notification_service.push_success("MOBILE"_T.data(), g_notification_service.push_success("MOBILE"_T.data(),
std::vformat("VEHICLE_FIX_AMOUNT"_T.data(), std::vformat("VEHICLE_FIX_AMOUNT"_T.data(),
std::make_format_args(amount_fixed, std::make_format_args(amount_fixed, v_fixed)));
amount_fixed == 1 ? "VEHICLE_FIX_HAS"_T.data() : "VEHICLE_FIX_HAVE"_T.data())));
}); });
ImGui::SameLine(); ImGui::SameLine();