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

chore: Replace strcat and others with fmt::format

Browse Source
This commit is contained in:
Yimura 2022-02-02 02:32:30 +01:00
parent 927203b844
commit 5ec1f1df9d
No known key found for this signature in database
GPG Key ID: 3D8FF4397E768682
5 changed files with 13 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
BigBaseV2/src/gui/window/window_player.cpp
View File

@ -6,13 +6,10 @@ namespace big
{
void window::w_player()
{
char title[64];
strcpy(title, "Player Options: ");
strcat(title, g_player_service->get_selected()->get_name());
strcat(title, "###player_options");
std::string title = fmt::format("Player Options: {}##player_options", g_player_service->get_selected()->get_name());
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");
tab_player::tab_info();

7
BigBaseV2/src/hooks/increment_stat_event.cpp
View File

@ -6,8 +6,6 @@ namespace big
{
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)
{
case RAGE_JOAAT("MPPLY_GAME_EXPLOITS"):
@ -15,10 +13,7 @@ namespace big
case RAGE_JOAAT("MPPLY_EXPLOITS"):
case RAGE_JOAAT("MPPLY_TC_ANNOYINGME"):
case RAGE_JOAAT("MPPLY_TC_HATE"):
char report[64];
strcpy(report, "~g~BLOCKED REPORT~s~\nFrom: <C>");
strcat(report, PLAYER::GET_PLAYER_NAME(sender_id));
strcat(report, "</C>");
std::string report = fmt::format("~g~BLOCKED REPORT~s~\nFrom: <C>{}</C>", sender->get_name());
notify::above_map(report);

24
BigBaseV2/src/hooks/received_event.cpp
View File

@ -36,10 +36,8 @@ namespace big
{
g_pointers->m_send_event_ack(event_manager, source_player, target_player, event_index, event_handled_bitset);
char msg[64];
strcpy(msg, "<C>");
strcat(msg, source_player->get_name());
strcat(msg, "</C> possibly attempting at freezing entity.");
std::string msg = fmt::format("<C>{}</C> possible attempt at freezing entity.", source_player->get_name());
notify::above_map(msg);
return false;
}
@ -58,11 +56,7 @@ namespace big
if (money >= 2000)
{
char msg[64];
strcpy(msg, "<C>");
strcat(msg, source_player->get_name());
strcat(msg, "</C> is spawning cash.");
std::string msg = fmt::format("<C>{}</C> is spawning cash.", source_player->get_name());
notify::above_map(msg);
}
@ -72,11 +66,7 @@ namespace big
case RockstarEvent::NETWORK_CHECK_CODE_CRCS_EVENT:
case RockstarEvent::REPORT_MYSELF_EVENT:
{
char msg[64];
strcpy(msg, "Detected <C>");
strcat(msg, source_player->get_name());
strcat(msg, "</C> as cheating.");
std::string msg = fmt::format("Detected <C>{}</C> as cheating.", source_player->get_name());
notify::above_map(msg);
break;
@ -85,10 +75,8 @@ namespace big
{
g_pointers->m_send_event_ack(event_manager, source_player, target_player, event_index, event_handled_bitset);
char msg[64];
strcpy(msg, "Denied player control request from <C>");
strcat(msg, source_player->get_name());
strcat(msg, "</C>");
std::string msg = fmt::format("Denied player control request from <C>{}</C>", source_player->get_name());
notify::above_map(msg);
return false;
}

7
BigBaseV2/src/hooks/script_event_handler.cpp
View File

@ -114,12 +114,7 @@ namespace big
if (strlen(type) != 0)
{
char msg[128];
strcpy(msg, "~g~BLOCKED SCRIPT EVENT~s~\nFrom: <C>");
strcat(msg, player->get_name());
strcat(msg, "</C>\nEvent Type: ~b~");
strcat(msg, type);
std::string msg = fmt::format("~g~BLOCKED SCRIPT EVENT~s~\nFrom: <C>{}</C>\nEvent Type: ~b~{}", player->get_name(), type);
notify::above_map(msg);
return true;

4
BigBaseV2/src/util/notify.hpp
View File

@ -12,7 +12,9 @@ namespace big::notify
HUD::ADD_TEXT_COMPONENT_SUBSTRING_PLAYER_NAME(text);
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)
{
char msg[128];
@ -49,7 +51,7 @@ namespace big::notify
inline void player_joined(CNetGamePlayer* net_game_player)
{
above_map(
fmt::format("<C>{}</C> joined.", net_game_player->get_name()).c_str()
fmt::format("<C>{}</C> joined.", net_game_player->get_name())
);
}
}