chore: Replace strcat and others with fmt::format
This commit is contained in:
parent
927203b844
commit
5ec1f1df9d
@ -6,13 +6,10 @@ namespace big
|
|||||||
{
|
{
|
||||||
void window::w_player()
|
void window::w_player()
|
||||||
{
|
{
|
||||||
char title[64];
|
std::string title = fmt::format("Player Options: {}##player_options", g_player_service->get_selected()->get_name());
|
||||||
strcpy(title, "Player Options: ");
|
|
||||||
strcat(title, g_player_service->get_selected()->get_name());
|
|
||||||
strcat(title, "###player_options");
|
|
||||||
|
|
||||||
ImGui::SetNextWindowSize({ 350.f, 300.f }, ImGuiCond_FirstUseEver);
|
ImGui::SetNextWindowSize({ 350.f, 300.f }, ImGuiCond_FirstUseEver);
|
||||||
if (g.window.player && g_player_service->get_selected()->is_valid() && ImGui::Begin(title, &g.window.player))
|
if (g.window.player && g_player_service->get_selected()->is_valid() && ImGui::Begin(title.c_str(), &g.window.player))
|
||||||
{
|
{
|
||||||
ImGui::BeginTabBar("tabbar_player");
|
ImGui::BeginTabBar("tabbar_player");
|
||||||
tab_player::tab_info();
|
tab_player::tab_info();
|
||||||
|
@ -6,8 +6,6 @@ namespace big
|
|||||||
{
|
{
|
||||||
bool hooks::increment_stat_event(CNetworkIncrementStatEvent* net_event, CNetGamePlayer* sender, int64_t a3)
|
bool hooks::increment_stat_event(CNetworkIncrementStatEvent* net_event, CNetGamePlayer* sender, int64_t a3)
|
||||||
{
|
{
|
||||||
Player sender_id = sender->m_player_id;
|
|
||||||
|
|
||||||
switch (net_event->m_stat)
|
switch (net_event->m_stat)
|
||||||
{
|
{
|
||||||
case RAGE_JOAAT("MPPLY_GAME_EXPLOITS"):
|
case RAGE_JOAAT("MPPLY_GAME_EXPLOITS"):
|
||||||
@ -15,10 +13,7 @@ namespace big
|
|||||||
case RAGE_JOAAT("MPPLY_EXPLOITS"):
|
case RAGE_JOAAT("MPPLY_EXPLOITS"):
|
||||||
case RAGE_JOAAT("MPPLY_TC_ANNOYINGME"):
|
case RAGE_JOAAT("MPPLY_TC_ANNOYINGME"):
|
||||||
case RAGE_JOAAT("MPPLY_TC_HATE"):
|
case RAGE_JOAAT("MPPLY_TC_HATE"):
|
||||||
char report[64];
|
std::string report = fmt::format("~g~BLOCKED REPORT~s~\nFrom: <C>{}</C>", sender->get_name());
|
||||||
strcpy(report, "~g~BLOCKED REPORT~s~\nFrom: <C>");
|
|
||||||
strcat(report, PLAYER::GET_PLAYER_NAME(sender_id));
|
|
||||||
strcat(report, "</C>");
|
|
||||||
|
|
||||||
notify::above_map(report);
|
notify::above_map(report);
|
||||||
|
|
||||||
|
@ -36,10 +36,8 @@ namespace big
|
|||||||
{
|
{
|
||||||
g_pointers->m_send_event_ack(event_manager, source_player, target_player, event_index, event_handled_bitset);
|
g_pointers->m_send_event_ack(event_manager, source_player, target_player, event_index, event_handled_bitset);
|
||||||
|
|
||||||
char msg[64];
|
std::string msg = fmt::format("<C>{}</C> possible attempt at freezing entity.", source_player->get_name());
|
||||||
strcpy(msg, "<C>");
|
notify::above_map(msg);
|
||||||
strcat(msg, source_player->get_name());
|
|
||||||
strcat(msg, "</C> possibly attempting at freezing entity.");
|
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@ -58,11 +56,7 @@ namespace big
|
|||||||
|
|
||||||
if (money >= 2000)
|
if (money >= 2000)
|
||||||
{
|
{
|
||||||
char msg[64];
|
std::string msg = fmt::format("<C>{}</C> is spawning cash.", source_player->get_name());
|
||||||
strcpy(msg, "<C>");
|
|
||||||
strcat(msg, source_player->get_name());
|
|
||||||
strcat(msg, "</C> is spawning cash.");
|
|
||||||
|
|
||||||
notify::above_map(msg);
|
notify::above_map(msg);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -72,11 +66,7 @@ namespace big
|
|||||||
case RockstarEvent::NETWORK_CHECK_CODE_CRCS_EVENT:
|
case RockstarEvent::NETWORK_CHECK_CODE_CRCS_EVENT:
|
||||||
case RockstarEvent::REPORT_MYSELF_EVENT:
|
case RockstarEvent::REPORT_MYSELF_EVENT:
|
||||||
{
|
{
|
||||||
char msg[64];
|
std::string msg = fmt::format("Detected <C>{}</C> as cheating.", source_player->get_name());
|
||||||
strcpy(msg, "Detected <C>");
|
|
||||||
strcat(msg, source_player->get_name());
|
|
||||||
strcat(msg, "</C> as cheating.");
|
|
||||||
|
|
||||||
notify::above_map(msg);
|
notify::above_map(msg);
|
||||||
|
|
||||||
break;
|
break;
|
||||||
@ -85,10 +75,8 @@ namespace big
|
|||||||
{
|
{
|
||||||
g_pointers->m_send_event_ack(event_manager, source_player, target_player, event_index, event_handled_bitset);
|
g_pointers->m_send_event_ack(event_manager, source_player, target_player, event_index, event_handled_bitset);
|
||||||
|
|
||||||
char msg[64];
|
std::string msg = fmt::format("Denied player control request from <C>{}</C>", source_player->get_name());
|
||||||
strcpy(msg, "Denied player control request from <C>");
|
notify::above_map(msg);
|
||||||
strcat(msg, source_player->get_name());
|
|
||||||
strcat(msg, "</C>");
|
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
@ -114,12 +114,7 @@ namespace big
|
|||||||
|
|
||||||
if (strlen(type) != 0)
|
if (strlen(type) != 0)
|
||||||
{
|
{
|
||||||
char msg[128];
|
std::string msg = fmt::format("~g~BLOCKED SCRIPT EVENT~s~\nFrom: <C>{}</C>\nEvent Type: ~b~{}", player->get_name(), type);
|
||||||
strcpy(msg, "~g~BLOCKED SCRIPT EVENT~s~\nFrom: <C>");
|
|
||||||
strcat(msg, player->get_name());
|
|
||||||
strcat(msg, "</C>\nEvent Type: ~b~");
|
|
||||||
strcat(msg, type);
|
|
||||||
|
|
||||||
notify::above_map(msg);
|
notify::above_map(msg);
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
|
@ -12,7 +12,9 @@ namespace big::notify
|
|||||||
HUD::ADD_TEXT_COMPONENT_SUBSTRING_PLAYER_NAME(text);
|
HUD::ADD_TEXT_COMPONENT_SUBSTRING_PLAYER_NAME(text);
|
||||||
HUD::END_TEXT_COMMAND_THEFEED_POST_TICKER(false, false);
|
HUD::END_TEXT_COMMAND_THEFEED_POST_TICKER(false, false);
|
||||||
}
|
}
|
||||||
|
inline void above_map(std::string text) { above_map(text.c_str()); }
|
||||||
|
|
||||||
|
// deprecated/unused
|
||||||
inline void blocked_event(const char* name, Player player)
|
inline void blocked_event(const char* name, Player player)
|
||||||
{
|
{
|
||||||
char msg[128];
|
char msg[128];
|
||||||
@ -49,7 +51,7 @@ namespace big::notify
|
|||||||
inline void player_joined(CNetGamePlayer* net_game_player)
|
inline void player_joined(CNetGamePlayer* net_game_player)
|
||||||
{
|
{
|
||||||
above_map(
|
above_map(
|
||||||
fmt::format("<C>{}</C> joined.", net_game_player->get_name()).c_str()
|
fmt::format("<C>{}</C> joined.", net_game_player->get_name())
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
Reference in New Issue
Block a user