From 6dcd08f6d190e7acd0f6b1ddaf193d51e72a8def Mon Sep 17 00:00:00 2001 From: FutureRave Date: Mon, 31 Oct 2022 17:24:29 +0000 Subject: [PATCH] Cleanup --- src/client/component/cheats.cpp | 2 +- src/client/component/command.cpp | 2 +- src/client/component/console.cpp | 2 +- src/client/component/dvar_patches.cpp | 2 +- src/client/component/exploit.cpp | 2 +- src/client/component/key_catcher.cpp | 2 +- src/client/component/network/network.cpp | 15 +++++++-------- src/client/component/network/network.hpp | 3 +-- src/client/component/patches.cpp | 2 +- src/client/component/rcon.cpp | 7 +++---- src/client/component/remove_hooks.cpp | 2 +- src/client/component/scheduler.cpp | 2 +- src/common/utils/flags.cpp | 4 ++-- 13 files changed, 22 insertions(+), 25 deletions(-) diff --git a/src/client/component/cheats.cpp b/src/client/component/cheats.cpp index fa763a9..2f59bac 100644 --- a/src/client/component/cheats.cpp +++ b/src/client/component/cheats.cpp @@ -1,5 +1,5 @@ #include -#include "../loader/component_loader.hpp" +#include "loader/component_loader.hpp" #include #include diff --git a/src/client/component/command.cpp b/src/client/component/command.cpp index 3cd285f..47c376f 100644 --- a/src/client/component/command.cpp +++ b/src/client/component/command.cpp @@ -1,5 +1,5 @@ #include -#include "../loader/component_loader.hpp" +#include "loader/component_loader.hpp" #include diff --git a/src/client/component/console.cpp b/src/client/component/console.cpp index 61d546f..512d98c 100644 --- a/src/client/component/console.cpp +++ b/src/client/component/console.cpp @@ -1,5 +1,5 @@ #include -#include "../loader/component_loader.hpp" +#include "loader/component_loader.hpp" #include #include diff --git a/src/client/component/dvar_patches.cpp b/src/client/component/dvar_patches.cpp index 96abbf8..8e8dc89 100644 --- a/src/client/component/dvar_patches.cpp +++ b/src/client/component/dvar_patches.cpp @@ -1,5 +1,5 @@ #include -#include "../loader/component_loader.hpp" +#include "loader/component_loader.hpp" #include diff --git a/src/client/component/exploit.cpp b/src/client/component/exploit.cpp index 3b0ba31..8820950 100644 --- a/src/client/component/exploit.cpp +++ b/src/client/component/exploit.cpp @@ -1,5 +1,5 @@ #include -#include "../loader/component_loader.hpp" +#include "loader/component_loader.hpp" #include diff --git a/src/client/component/key_catcher.cpp b/src/client/component/key_catcher.cpp index dd9199f..8468958 100644 --- a/src/client/component/key_catcher.cpp +++ b/src/client/component/key_catcher.cpp @@ -1,5 +1,5 @@ #include -#include "../loader/component_loader.hpp" +#include "loader/component_loader.hpp" #include diff --git a/src/client/component/network/network.cpp b/src/client/component/network/network.cpp index cc65262..25c7bcd 100644 --- a/src/client/component/network/network.cpp +++ b/src/client/component/network/network.cpp @@ -1,10 +1,10 @@ #include -#include "../../loader/component_loader.hpp" +#include "loader/component_loader.hpp" #include #include -#include "../console.hpp" +#include "component/console.hpp" #include "network.hpp" @@ -28,8 +28,8 @@ bool handle_command(game::netadr_s* address, const char* command, return false; } - const std::string_view data(reinterpret_cast(msg->data) + offset, - msg->cursize - offset); + const std::string data(reinterpret_cast(msg->data) + offset, + msg->cursize - offset); handler->second(*address, data); return true; @@ -109,10 +109,9 @@ public: private: static void add_network_commands() { - on_packet("naughty_reply", - [](const game::netadr_s&, const std::string_view&) { - utils::nt::raise_hard_exception(); - }); + on_packet("naughty_reply", [](const game::netadr_s&, const std::string&) { + utils::nt::raise_hard_exception(); + }); } }; } // namespace network diff --git a/src/client/component/network/network.hpp b/src/client/component/network/network.hpp index dee8fd2..99eea4c 100644 --- a/src/client/component/network/network.hpp +++ b/src/client/component/network/network.hpp @@ -5,8 +5,7 @@ void send(const game::netadr_s& address, const std::string& command, const std::string& data = {}, char separator = ' '); void send_data(const game::netadr_s& address, const std::string& data); -using callback = - std::function; +using callback = std::function; void on_packet(const std::string& command, const callback& callback); const char* net_adr_to_string(const game::netadr_s& a); diff --git a/src/client/component/patches.cpp b/src/client/component/patches.cpp index 72d77c9..0a142a9 100644 --- a/src/client/component/patches.cpp +++ b/src/client/component/patches.cpp @@ -1,5 +1,5 @@ #include -#include "../loader/component_loader.hpp" +#include "loader/component_loader.hpp" #include diff --git a/src/client/component/rcon.cpp b/src/client/component/rcon.cpp index 736f4e0..cf984ef 100644 --- a/src/client/component/rcon.cpp +++ b/src/client/component/rcon.cpp @@ -1,5 +1,5 @@ #include -#include "../loader/component_loader.hpp" +#include "loader/component_loader.hpp" #include @@ -35,9 +35,8 @@ private: static void add_commands() { network::on_packet("rcon_authorization", [](const game::netadr_s& adr, - const std::string_view& data) { - const auto signed_msg = - utils::cryptography::ecc::sign_message(key, std::string(data)); + const std::strin& data) { + const auto signed_msg = utils::cryptography::ecc::sign_message(key, data); proto::rcon::command info; info.set_commands(commands); diff --git a/src/client/component/remove_hooks.cpp b/src/client/component/remove_hooks.cpp index 417e3b1..dc30ec9 100644 --- a/src/client/component/remove_hooks.cpp +++ b/src/client/component/remove_hooks.cpp @@ -1,5 +1,5 @@ #include -#include "../loader/component_loader.hpp" +#include "loader/component_loader.hpp" #include diff --git a/src/client/component/scheduler.cpp b/src/client/component/scheduler.cpp index 8197aa0..bdc3c41 100644 --- a/src/client/component/scheduler.cpp +++ b/src/client/component/scheduler.cpp @@ -1,5 +1,5 @@ #include -#include "../loader/component_loader.hpp" +#include "loader/component_loader.hpp" #include #include diff --git a/src/common/utils/flags.cpp b/src/common/utils/flags.cpp index 4e02c31..b90018d 100644 --- a/src/common/utils/flags.cpp +++ b/src/common/utils/flags.cpp @@ -1,7 +1,7 @@ #include -#include "../utils/nt.hpp" -#include "../utils/string.hpp" +#include +#include #include "flags.hpp" #include