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

refactor(Reactions): translations and change formatting to std::format (#2382)

Browse Source 
* refactor(Reactions): replace snprintf strings with std::format
* feat(Reactions): move reaction strings to translation repo
* fix(Notify): crash formatting
This commit is contained in:
Andreas Maerten
2023-11-05 13:00:51 +01:00
committed by GitHub
parent 5cd260d198
commit ab7d8e4924
4 changed files with 74 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -30,20 +30,19 @@ namespace big
}
}
if (kick)
if (kick)
{
g_fiber_pool->queue_job([player] {
dynamic_cast<player_command*>(command::get(RAGE_JOAAT("multikick")))->call(player, {});
});
}
if (timeout)
{
player->block_net_events = true;
player->block_clone_sync = true;
player->block_clone_create = true;
LOGF(WARNING, "{} has been timed out", player->get_name());
player->block_net_events = true;
player->block_clone_sync = true;
player->block_clone_create = true;
LOGF(WARNING, "{} has been timed out", player->get_name());
}
}
@ -53,7 +52,7 @@ namespace big
if (!player->is_valid())
return;
if ((player->is_friend() && g.session.trust_friends) || player->is_trusted || g.session.trust_session)
return;
return;
if (log)
{
@ -64,25 +63,20 @@ namespace big
if (announce_in_chat)
{
g_fiber_pool->queue_job([player, this] {
char chat[255];
snprintf(chat,
sizeof(chat),
std::format("{} {}", g.session.chat_output_prefix, m_announce_message).data(),
player->get_name());
auto chat = std::format("{} {}", g.session.chat_output_prefix, g_translation_service.get_translation(m_announce_message));
if (g_hooking->get_original<hooks::send_chat_message>()(*g_pointers->m_gta.m_send_chat_ptr,
g_player_service->get_self()->get_net_data(),
chat,
chat.data(),
is_team_only))
notify::draw_chat(chat, g_player_service->get_self()->get_name(), is_team_only);
notify::draw_chat(chat.c_str(), g_player_service->get_self()->get_name(), is_team_only);
});
}
if (notify)
{
char notification[500]{}; // I don't like using sprintf but there isn't an alternative afaik
snprintf(notification, sizeof(notification), m_notify_message, player->get_name());
g_notification_service->push_warning("PROTECTIONS"_T.data(), notification);
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())));
}
process_common(player);