From 2fcf568123582304a1e9d143cda133d0c741fb19 Mon Sep 17 00:00:00 2001 From: TotallyNotElite <1yourexperiment@protonmail.com> Date: Sun, 19 Aug 2018 23:03:51 +0200 Subject: [PATCH] Some more precompiler things --- include/config.h.in | 3 ++- include/online/Online.hpp | 4 +++- src/PlayerTools.cpp | 10 +++++----- src/hooks/Paint.cpp | 2 ++ src/online/Online.cpp | 7 +++++-- 5 files changed, 17 insertions(+), 9 deletions(-) diff --git a/include/config.h.in b/include/config.h.in index 48ab0479..ae03b13e 100755 --- a/include/config.h.in +++ b/include/config.h.in @@ -15,4 +15,5 @@ #define ENABLE_TEXTMODE_STDIN @EnableTextmodeStdin@ #define ENABLE_NULL_GRAPHICS @EnableNullGraphics@ #define TEXTMODE @Textmode@ -#define ENABLE_PROFILER @EnableProfiler@ \ No newline at end of file +#define ENABLE_PROFILER @EnableProfiler@ +#define ENABLE_ONLINE @EnableOnlineFeatures@ diff --git a/include/online/Online.hpp b/include/online/Online.hpp index bf1281f0..c6d60008 100644 --- a/include/online/Online.hpp +++ b/include/online/Online.hpp @@ -3,7 +3,8 @@ */ #pragma once - +#include "config.h" +#if ENABLE_ONLINE #include #if ENABLE_VISUALS #include @@ -39,3 +40,4 @@ void update(); user_data *getUserData(unsigned steamId); } // namespace online +#endif diff --git a/src/PlayerTools.cpp b/src/PlayerTools.cpp index ccbf994c..d09c1b1e 100644 --- a/src/PlayerTools.cpp +++ b/src/PlayerTools.cpp @@ -49,7 +49,7 @@ IgnoreReason shouldTargetSteamId(unsigned id) auto &pl = playerlist::AccessData(id); if (playerlist::IsFriendly(pl.state)) return IgnoreReason::LOCAL_PLAYER_LIST; - +#if ENABLE_ONLINE auto *co = online::getUserData(id); if (co) { @@ -67,7 +67,7 @@ IgnoreReason shouldTargetSteamId(unsigned id) if (co->is_developer) return IgnoreReason::DEVELOPER; } - +#endif return IgnoreReason::DO_NOT_IGNORE; } IgnoreReason shouldTarget(CachedEntity *entity) @@ -93,11 +93,11 @@ bool shouldAlwaysRenderEspSteamId(unsigned id) auto &pl = playerlist::AccessData(id); if (pl.state != playerlist::k_EState::DEFAULT) return true; - +#if ENABLE_ONLINE auto *co = online::getUserData(id); if (co) return true; - +#endif return false; } bool shouldAlwaysRenderEsp(CachedEntity *entity) @@ -158,4 +158,4 @@ void onKilledBy(CachedEntity *entity) { onKilledBy(entity->player_info.friendsID); } -} // namespace player_tools \ No newline at end of file +} // namespace player_tools diff --git a/src/hooks/Paint.cpp b/src/hooks/Paint.cpp index eb4ef9c8..9883ce24 100644 --- a/src/hooks/Paint.cpp +++ b/src/hooks/Paint.cpp @@ -29,7 +29,9 @@ DEFINE_HOOKED_METHOD(Paint, void, IEngineVGui *this_, PaintMode_t mode) #endif hacks::shared::catbot::update(); hitrate::Update(); +#if ENABLE_ONLINE online::update(); +#endif #if ENABLE_IPC static Timer nametimer{}; if (nametimer.test_and_set(1000 * 10)) diff --git a/src/online/Online.cpp b/src/online/Online.cpp index de490928..a9080929 100644 --- a/src/online/Online.cpp +++ b/src/online/Online.cpp @@ -1,7 +1,8 @@ /* Created on 23.06.18. */ - +#include "config.h" +#if ENABLE_ONLINE #include #include @@ -12,6 +13,7 @@ #undef null + #include #include #include @@ -332,4 +334,5 @@ user_data *getUserData(unsigned steamId) // SteamID does not belong to online user return nullptr; } -} // namespace online \ No newline at end of file +} // namespace online +#endif