Merge pull request #554 from TotallyNotElite/#ifstuff

Precompiler fixes

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@
+#define ENABLE_PROFILER @EnableProfiler@
+#define ENABLE_ONLINE @EnableOnlineFeatures@

include/online/Online.hpp

@@ -3,7 +3,8 @@
 */
 
 #pragma once
-
+#include "config.h"
+#if ENABLE_ONLINE
 #include <string>
 #if ENABLE_VISUALS
 #include <colors.hpp>
@@ -39,3 +40,4 @@ void update();
 
 user_data *getUserData(unsigned steamId);
 } // namespace online
+#endif

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
+} // namespace player_tools

src/hacks/LightESP.cpp

@@ -1,8 +1,8 @@
+#include "hacks/LightESP.hpp"
 #if ENABLE_VISUALS
 #include <glez/draw.hpp>
 #endif
 #include <settings/Bool.hpp>
-#include "hacks/LightESP.hpp"
 
 static settings::Bool enable{ "lightesp.enable", "false" };
 

src/hacks/Misc.cpp

@@ -5,6 +5,7 @@
  *      Author: nullifiedcat
  */
 
+#include "common.hpp"
 #include <unistd.h>
 #include <sys/types.h>
 #include <sys/mman.h>
@@ -20,7 +21,6 @@
 #include "core/sharedobj.hpp"
 
 #include "hack.hpp"
-#include "common.hpp"
 
 static settings::Bool render_zoomed{ "visuals.render-local-zoomed", "false" };
 static settings::Bool anti_afk{ "misc.anti-afk", "false" };

src/hacks/Radar.cpp

@@ -4,11 +4,11 @@
  *  Created on: Mar 28, 2017
  *      Author: nullifiedcat
  */
+#include "common.hpp"
 #if ENABLE_VISUALS
 #include <glez/draw.hpp>
 #endif
 #include <settings/Int.hpp>
-#include "common.hpp"
 #include "hacks/Radar.hpp"
 
 #ifndef FEATURE_RADAR_DISABLED

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))

src/online/Online.cpp

@@ -1,7 +1,8 @@
 /*
   Created on 23.06.18.
 */
-
+#include "config.h"
+#if ENABLE_ONLINE
 #include <online/Online.hpp>
 #include <core/cvwrapper.hpp>
 
@@ -12,6 +13,7 @@
 
 #undef null
 
+
 #include <co/OnlineService.hpp>
 #include <fstream>
 #include <init.hpp>
@@ -332,4 +334,5 @@ user_data *getUserData(unsigned steamId)
     // SteamID does not belong to online user
     return nullptr;
 }
-} // namespace online
+} // namespace online
+#endif

src/prediction.cpp

@@ -4,11 +4,11 @@
  *  Created on: Dec 5, 2016
  *      Author: nullifiedcat
  */
+#include "common.hpp"
 #if ENABLE_VISUALS
 #include <glez/draw.hpp>
 #endif
 #include <settings/Bool.hpp>
-#include "common.hpp"
 
 static settings::Bool debug_enginepred{ "debug.engine-pred-others", "false" };
 static settings::Bool debug_pp_extrapolate{ "debug.pp-extrapolate", "false" };