From faaa317ba1f238060798ab6f15468483a0db6e61 Mon Sep 17 00:00:00 2001 From: dynamoNg <139460769+lonelybud@users.noreply.github.com> Date: Sat, 31 Aug 2024 01:19:03 +0530 Subject: [PATCH] format files and do renames --- src/core/var/misc.hpp | 42 ------------------------ src/core/var/sync_lists.hpp | 42 ++++++++++++++++++++++++ src/hooks/protections/can_apply_data.cpp | 10 +++--- src/hooks/protections/received_event.cpp | 4 +-- src/services/gui/gui_service.hpp | 2 +- src/views/network_syncs.cpp | 14 ++++---- src/views/players/player/player_info.cpp | 4 +-- 7 files changed, 59 insertions(+), 59 deletions(-) delete mode 100644 src/core/var/misc.hpp create mode 100644 src/core/var/sync_lists.hpp diff --git a/src/core/var/misc.hpp b/src/core/var/misc.hpp deleted file mode 100644 index 0b6eeead..00000000 --- a/src/core/var/misc.hpp +++ /dev/null @@ -1,42 +0,0 @@ -#pragma once -#include "services/players/player.hpp" - -namespace big -{ - class sync_list - { - public: - std::array list; - int size = 0; - - inline void add_sync_data_to_list(player_ptr sender, std::string details) - { - if (size == 100) - { - // Copy the last 50 elements to the first 50 positions - std::copy(list.begin() + 50, list.end(), list.begin()); - size = 50; - } - - // Add the new element after the first 50 elements - auto now = std::chrono::system_clock::now(); - auto localTime = std::chrono::zoned_time{std::chrono::current_zone(), now}; - - list[size] = std::format("[{:%H:%M:%S}] [{}] {}",localTime.get_local_time(), sender->get_name(), details); - - ++size; - } - }; - - struct g_misc_data_t - { - sync_list ped_sync_list; - sync_list vehicle_sync_list; - sync_list object_sync_list; - sync_list pickup_sync_list; - sync_list explosion_sync_list; - sync_list ptfx_sync_list; - }; - - inline g_misc_data_t g_misc_data{}; -} \ No newline at end of file diff --git a/src/core/var/sync_lists.hpp b/src/core/var/sync_lists.hpp new file mode 100644 index 00000000..8d633ab7 --- /dev/null +++ b/src/core/var/sync_lists.hpp @@ -0,0 +1,42 @@ +#pragma once +#include "services/players/player.hpp" + +namespace big +{ + class sync_list + { + public: + std::array list; + int size = 0; + + void add_sync_data(player_ptr sender, std::string details) + { + if (size == 100) + { + // Copy the last 50 elements to the first 50 positions + std::copy(list.begin() + 50, list.end(), list.begin()); + // Add the new elements after the first 50 elements + size = 50; + } + + auto now = std::chrono::system_clock::now(); + auto localTime = std::chrono::zoned_time{std::chrono::current_zone(), now}; + + list[size] = std::format("[{:%H:%M:%S}] [{}] {}", localTime.get_local_time(), sender->get_name(), details); + + ++size; + } + }; + + struct g_sync_lists_t + { + sync_list peds; + sync_list vehicles; + sync_list objects; + sync_list pickups; + sync_list explosions; + sync_list ptfxs; + }; + + inline g_sync_lists_t g_sync_lists{}; +} \ No newline at end of file diff --git a/src/hooks/protections/can_apply_data.cpp b/src/hooks/protections/can_apply_data.cpp index 6ea1834a..b0ff20da 100644 --- a/src/hooks/protections/can_apply_data.cpp +++ b/src/hooks/protections/can_apply_data.cpp @@ -70,7 +70,7 @@ #include "util/sync_trees.hpp" #include "vehicle/CTrainConfig.hpp" #include "vehicle/CVehicleModelInfo.hpp" -#include "core/var/misc.hpp" +#include "core/var/sync_lists.hpp" namespace big @@ -1208,7 +1208,7 @@ namespace big auto& vehs = g_gta_data_service.vehicles(); auto it = vehs.find(creation_node->m_model); - g_misc_data.vehicle_sync_list.add_sync_data_to_list(sender_plyr, (it != vehs.end() ? g_gta_data_service.get_vehicle_full_name(it->second) : "?")); + g_sync_lists.vehicles.add_sync_data(sender_plyr, (it != vehs.end() ? g_gta_data_service.get_vehicle_full_name(it->second) : "?")); break; } @@ -1241,7 +1241,7 @@ namespace big } } - g_misc_data.pickup_sync_list.add_sync_data_to_list(sender_plyr, ""); + g_sync_lists.pickups.add_sync_data(sender_plyr, ""); break; } case sync_node_id("CPhysicalAttachDataNode"): @@ -1299,7 +1299,7 @@ namespace big auto& peds = g_gta_data_service.peds(); auto it = peds.find(creation_node->m_model); - g_misc_data.ped_sync_list.add_sync_data_to_list(sender_plyr, + g_sync_lists.peds.add_sync_data(sender_plyr, std::format("{}, {}", it != peds.end() ? it->second.m_name : "?", it != peds.end() ? it->second.m_ped_type : "?")); break; @@ -1332,7 +1332,7 @@ namespace big return true; } - g_misc_data.object_sync_list.add_sync_data_to_list(sender_plyr, std::to_string(creation_node->m_model)); + g_sync_lists.objects.add_sync_data(sender_plyr, std::to_string(creation_node->m_model)); break; } case sync_node_id("CPlayerAppearanceDataNode"): diff --git a/src/hooks/protections/received_event.cpp b/src/hooks/protections/received_event.cpp index 39f7a11d..c0f57330 100644 --- a/src/hooks/protections/received_event.cpp +++ b/src/hooks/protections/received_event.cpp @@ -1,5 +1,5 @@ #include "core/data/bullet_impact_types.hpp" -#include "core/var/misc.hpp" +#include "core/var/sync_lists.hpp" #include "fiber_pool.hpp" #include "gta/enums.hpp" #include "gta/net_game_event.hpp" @@ -399,7 +399,7 @@ namespace big if (plyr) { auto exp_type_itr = BULLET_IMPACTS.find(explosionType); - g_misc_data.explosion_sync_list.add_sync_data_to_list(plyr, + g_sync_lists.explosions.add_sync_data(plyr, std::format("(Dist- {}, {})", math::distance_between_vectors(*plyr->get_ped()->get_position(), {posX, posY, posZ}), exp_type_itr != BULLET_IMPACTS.end() ? exp_type_itr->second : "?")); diff --git a/src/services/gui/gui_service.hpp b/src/services/gui/gui_service.hpp index cacbaeef..3f53544c 100644 --- a/src/services/gui/gui_service.hpp +++ b/src/services/gui/gui_service.hpp @@ -169,7 +169,7 @@ namespace big }, }, }, - { + { TAB_DECL(NETWORK_SYNCS), view::network_syncs }, diff --git a/src/views/network_syncs.cpp b/src/views/network_syncs.cpp index 67f800e4..adad414e 100644 --- a/src/views/network_syncs.cpp +++ b/src/views/network_syncs.cpp @@ -1,4 +1,4 @@ -#include "core/var/misc.hpp" +#include "core/var/sync_lists.hpp" #include "services/players/player_service.hpp" #include "view.hpp" @@ -19,12 +19,12 @@ namespace big } static const std::unordered_map all_special_views = { - {"ped", &g_misc_data.ped_sync_list}, - {"vehicle", &g_misc_data.vehicle_sync_list}, - {"object", &g_misc_data.object_sync_list}, - {"pickup", &g_misc_data.pickup_sync_list}, - {"explosion", &g_misc_data.explosion_sync_list}, - {"ptfx", &g_misc_data.ptfx_sync_list}, + {"ped", &g_sync_lists.peds}, + {"vehicle", &g_sync_lists.vehicles}, + {"object", &g_sync_lists.objects}, + {"pickup", &g_sync_lists.pickups}, + {"explosion", &g_sync_lists.explosions}, + {"ptfx", &g_sync_lists.ptfxs}, }; void view::network_syncs() diff --git a/src/views/players/player/player_info.cpp b/src/views/players/player/player_info.cpp index d9a7227c..1938f9fd 100644 --- a/src/views/players/player/player_info.cpp +++ b/src/views/players/player/player_info.cpp @@ -159,7 +159,7 @@ namespace big ImGui::Checkbox("VIEW_PLAYER_INFO_BLOCK_CLONE_CREATE"_T.data(), &g_player_service->get_selected()->block_clone_create); ImGui::Checkbox("VIEW_PLAYER_INFO_BLOCK_CLONE_SYNC"_T.data(), &g_player_service->get_selected()->block_clone_sync); ImGui::Checkbox("VIEW_PLAYER_INFO_BLOCK_NETWORK_EVENTS"_T.data(), &g_player_service->get_selected()->block_net_events); - ImGui::Checkbox("VIEW_PLAYER_INFO_BLOCK_PTFX_EVENTS"_T.data(), &g_player_service->get_selected()->block_ptfx); + ImGui::Checkbox("VIEW_PLAYER_INFO_BLOCK_PTFX_EVENTS"_T.data(), &g_player_service->get_selected()->block_ptfx); ImGui::Checkbox("VIEW_PLAYER_INFO_LOG_CLONES"_T.data(), &g_player_service->get_selected()->log_clones); ImGui::Separator(); @@ -248,7 +248,7 @@ namespace big if (CVehicleModelInfo* vehicle_model_info = static_cast(vehicle->m_model_info)) { auto vehicle_item = g_gta_data_service.vehicles()[vehicle_model_info->m_hash]; - vehicle_name = g_gta_data_service.get_vehicle_full_name(vehicle_item); + vehicle_name = g_gta_data_service.get_vehicle_full_name(vehicle_item); } if (veh_damage_bits & (uint32_t)eEntityProofs::GOD)