diff --git a/BigBaseV2/src/gui/window/window_player.cpp b/BigBaseV2/src/gui/window/window_player.cpp
index 54c13c50..5fd9c4a5 100644
--- a/BigBaseV2/src/gui/window/window_player.cpp
+++ b/BigBaseV2/src/gui/window/window_player.cpp
@@ -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();
diff --git a/BigBaseV2/src/hooks/increment_stat_event.cpp b/BigBaseV2/src/hooks/increment_stat_event.cpp
index 91ce95b0..34136e5b 100644
--- a/BigBaseV2/src/hooks/increment_stat_event.cpp
+++ b/BigBaseV2/src/hooks/increment_stat_event.cpp
@@ -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: ");
- strcat(report, PLAYER::GET_PLAYER_NAME(sender_id));
- strcat(report, "");
+ std::string report = fmt::format("~g~BLOCKED REPORT~s~\nFrom: {}", sender->get_name());
notify::above_map(report);
diff --git a/BigBaseV2/src/hooks/received_event.cpp b/BigBaseV2/src/hooks/received_event.cpp
index 6411fb11..2f624ad8 100644
--- a/BigBaseV2/src/hooks/received_event.cpp
+++ b/BigBaseV2/src/hooks/received_event.cpp
@@ -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, "");
- strcat(msg, source_player->get_name());
- strcat(msg, " possibly attempting at freezing entity.");
+ std::string msg = fmt::format("{} 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, "");
- strcat(msg, source_player->get_name());
- strcat(msg, " is spawning cash.");
-
+ std::string msg = fmt::format("{} 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 ");
- strcat(msg, source_player->get_name());
- strcat(msg, " as cheating.");
-
+ std::string msg = fmt::format("Detected {} 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 ");
- strcat(msg, source_player->get_name());
- strcat(msg, "");
+ std::string msg = fmt::format("Denied player control request from {}", source_player->get_name());
+ notify::above_map(msg);
return false;
}
diff --git a/BigBaseV2/src/hooks/script_event_handler.cpp b/BigBaseV2/src/hooks/script_event_handler.cpp
index ffebaafe..a3f1c858 100644
--- a/BigBaseV2/src/hooks/script_event_handler.cpp
+++ b/BigBaseV2/src/hooks/script_event_handler.cpp
@@ -114,12 +114,7 @@ namespace big
if (strlen(type) != 0)
{
- char msg[128];
- strcpy(msg, "~g~BLOCKED SCRIPT EVENT~s~\nFrom: ");
- strcat(msg, player->get_name());
- strcat(msg, "\nEvent Type: ~b~");
- strcat(msg, type);
-
+ std::string msg = fmt::format("~g~BLOCKED SCRIPT EVENT~s~\nFrom: {}\nEvent Type: ~b~{}", player->get_name(), type);
notify::above_map(msg);
return true;
diff --git a/BigBaseV2/src/util/notify.hpp b/BigBaseV2/src/util/notify.hpp
index 1faf11b5..f450f9f5 100644
--- a/BigBaseV2/src/util/notify.hpp
+++ b/BigBaseV2/src/util/notify.hpp
@@ -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("{} joined.", net_game_player->get_name()).c_str()
+ fmt::format("{} joined.", net_game_player->get_name())
);
}
}
\ No newline at end of file