Merge remote-tracking branch 'BenCat07/origin/Pathfinder' into Pathfinder

include/PlayerTools.hpp

@@ -40,4 +40,4 @@ std::optional<colors::rgba_t> forceEspColor(CachedEntity *entity);
 #endif
 
 void onKilledBy(CachedEntity *entity);
-}
+} // namespace player_tools

include/angles.hpp

@@ -95,4 +95,4 @@ inline angle_data_s &data(const CachedEntity *entity)
 {
     return data_idx(entity->m_IDX);
 }
-}
+} // namespace angles

include/backpacktf.hpp

@@ -32,4 +32,4 @@ struct backpack_data_s
 const backpack_data_s &get_data(unsigned id);
 void init();
 bool enabled();
-}
+} // namespace backpacktf

include/chatstack.hpp

@@ -28,4 +28,4 @@ void Reset();
 
 extern std::stack<msg_t> stack;
 extern float last_say;
-}
+} // namespace chat_stack

include/classinfo/css.gen.hpp

@@ -494,6 +494,6 @@ public:
 };
 
 extern css css_list;
-}
+} // namespace client_classes
 
 #endif /* css_AUTOGEN_HPP */

include/classinfo/css_constexpr.gen.hpp

@@ -492,6 +492,6 @@ public:
     static constexpr int CCSGameRulesProxy                     = 26;
     static constexpr int CBaseCSGrenadeProjectile              = 7;
 };
-}
+} // namespace client_classes_constexpr
 
 #endif /* css_CONSTEXPR_AUTOGEN_HPP */

include/classinfo/dab.gen.hpp

@@ -523,6 +523,6 @@ public:
 };
 
 extern dab dab_list;
-}
+} // namespace client_classes
 
 #endif /* dab_AUTOGEN_HPP */

include/classinfo/dab_constexpr.gen.hpp

@@ -521,6 +521,6 @@ public:
     static constexpr int CBaseGrenadeProjectile                = 12;
     static constexpr int CDAViewModel                          = 28;
 };
-}
+} // namespace client_classes_constexpr
 
 #endif /* dab_CONSTEXPR_AUTOGEN_HPP */

include/classinfo/dummy.gen.hpp

@@ -537,6 +537,6 @@ public:
 };
 
 extern dummy dummy_list;
-}
+} // namespace client_classes
 
 #endif /* DUMMY_AUTOGEN_HPP */

include/classinfo/dynamic.gen.hpp

@@ -539,6 +539,6 @@ public:
 };
 
 extern dynamic dynamic_list;
-}
+} // namespace client_classes
 
 #endif /* DYNAMIC_AUTOGEN_HPP */

include/classinfo/hl2dm.gen.hpp

@@ -494,6 +494,6 @@ public:
 };
 
 extern hl2dm hl2dm_list;
-}
+} // namespace client_classes
 
 #endif /* hl2dm_AUTOGEN_HPP */

include/classinfo/hl2dm_constexpr.gen.hpp

@@ -492,6 +492,6 @@ public:
     static constexpr int CCSGameRulesProxy                     = 0;
     static constexpr int CBaseCSGrenadeProjectile              = 0;
 };
-}
+} // namespace client_classes_constexpr
 
 #endif /* hl2dm_CONSTEXPR_AUTOGEN_HPP */

include/classinfo/tf2.gen.hpp

@@ -537,6 +537,6 @@ public:
 };
 
 extern tf2 tf2_list;
-}
+} // namespace client_classes
 
 #endif /* tf2_AUTOGEN_HPP */

include/classinfo/tf2_constexpr.gen.hpp

@@ -535,6 +535,6 @@ public:
     static constexpr int CTFPointManager                       = 249;
     static constexpr int CTFFlameManager                       = 205;
 };
-}
+} // namespace client_classes_constexpr
 
 #endif /* tf2_CONSTEXPR_AUTOGEN_HPP */

include/classinfo/tf2c.gen.hpp

@@ -494,6 +494,6 @@ public:
 };
 
 extern tf2c tf2c_list;
-}
+} // namespace client_classes
 
 #endif /* tf2c_AUTOGEN_HPP */

include/classinfo/tf2c_constexpr.gen.hpp

@@ -492,6 +492,6 @@ public:
     static constexpr int CCSGameRulesProxy                     = 0;
     static constexpr int CBaseCSGrenadeProjectile              = 0;
 };
-}
+} // namespace client_classes_constexpr
 
 #endif /* tf2c_CONSTEXPR_AUTOGEN_HPP */

include/core/interfaces.hpp

@@ -14,7 +14,7 @@ namespace vgui
 {
 class ISurface;
 class IPanel;
-}
+} // namespace vgui
 
 class ISteamClient;
 class ISteamFriends;

include/core/sharedobj.hpp

@@ -52,4 +52,4 @@ SharedObject &libsdl();
 #endif
 
 void LoadAllSharedObjects();
-}
+} // namespace sharedobj

include/crits.hpp

@@ -31,7 +31,7 @@ namespace criticals
 void create_move();
 void draw();
 bool random_crits_enabled();
-}
+} // namespace criticals
 
 #include <unordered_map>
 

include/entitycache.hpp

@@ -232,4 +232,4 @@ inline CachedEntity &Get(int idx)
 void Update();
 void Invalidate();
 extern int max;
-}
+} // namespace entity_cache

include/entityhitboxcache.hpp

@@ -67,4 +67,4 @@ inline EntityHitboxCache &Get(unsigned i)
             "Requested out-of-range entity hitbox cache entry!");
     return array[i];
 }
-}
+} // namespace hitbox_cache

include/hack.hpp

@@ -33,4 +33,4 @@ const std::string &GetType();
 void Initialize();
 void Think();
 void Shutdown();
-}
+} // namespace hack

include/hacks/Achievement.hpp

@@ -12,4 +12,4 @@ namespace hacks::tf2::achievement
 
 void Lock();
 void Unlock();
-}
+} // namespace hacks::tf2::achievement

include/hacks/Aimbot.hpp

@@ -57,4 +57,4 @@ int ClosestHitbox(CachedEntity *target);
 void DoSlowAim(Vector &inputAngle);
 bool UpdateAimkey();
 float EffectiveTargetingRange();
-}
+} // namespace hacks::shared::aimbot

include/hacks/Announcer.hpp

@@ -15,4 +15,4 @@ namespace hacks::shared::announcer
 void playsound(const std::string &);
 void init();
 void shutdown();
-}
+} // namespace hacks::shared::announcer

include/hacks/AntiAim.hpp

@@ -16,4 +16,4 @@ void SetSafeSpace(int safespace);
 bool ShouldAA(CUserCmd *cmd);
 void ProcessUserCmd(CUserCmd *cmd);
 bool isEnabled();
-}
+} // namespace hacks::shared::antiaim

include/hacks/AntiAntiAim.hpp

@@ -16,4 +16,4 @@ namespace hacks::shared::anti_anti_aim
 
 void createMove();
 void resolveEnt(int IDX, IClientEntity *entity = nullptr);
-}
+} // namespace hacks::shared::anti_anti_aim

include/hacks/AntiBackstab.hpp

@@ -15,4 +15,4 @@ extern bool noaa;
 void CreateMove();
 
 void PaintTraverse();
-}
+} // namespace hacks::tf2::antibackstab

include/hacks/AntiCheat.hpp

@@ -21,4 +21,4 @@ void CreateMove();
 void SetRage(player_info_t info);
 void ResetPlayer(int index);
 void ResetEverything();
-}
+} // namespace hacks::shared::anticheat

include/hacks/AutoBackstab.hpp

@@ -12,4 +12,4 @@ namespace hacks::tf2::autobackstab
 
 void CreateMove();
 const Vector GetWorldSpaceCenter(CachedEntity *ent);
-}
+} // namespace hacks::tf2::autobackstab

include/hacks/AutoHeal.hpp

@@ -30,4 +30,4 @@ void UpdateData();
 int BestTarget();
 int HealingPriority(int idx);
 bool CanHeal(int idx);
-}
+} // namespace hacks::tf::autoheal

include/hacks/AutoJoin.hpp

@@ -14,4 +14,4 @@ void resetQueueTimer();
 void update();
 void updateSearch();
 void onShutdown();
-}
+} // namespace hacks::shared::autojoin

include/hacks/AutoReflect.hpp

@@ -15,4 +15,4 @@ void Draw();
 void CreateMove();
 bool ShouldReflect(CachedEntity *ent);
 bool IsEntStickyBomb(CachedEntity *ent);
-}
+} // namespace hacks::tf::autoreflect

include/hacks/AutoSticky.hpp

@@ -13,4 +13,4 @@ namespace hacks::tf::autosticky
 {
 bool ShouldDetonate(CachedEntity *bomb);
 void CreateMove();
-}
+} // namespace hacks::tf::autosticky

include/hacks/Backtrack.hpp

@@ -64,4 +64,4 @@ extern bool isBacktrackEnabled;
 float getLatency();
 int getTicks();
 bool ValidTick(BacktrackData &i, CachedEntity *ent);
-}
+} // namespace hacks::shared::backtrack

include/hacks/CMakeLists.txt

@@ -30,6 +30,7 @@ target_sources(cathook PRIVATE
         "${CMAKE_CURRENT_LIST_DIR}/Killstreak.hpp"
         "${CMAKE_CURRENT_LIST_DIR}/LightESP.hpp"
         "${CMAKE_CURRENT_LIST_DIR}/Misc.hpp"
+	"${CMAKE_CURRENT_LIST_DIR}/NavBot.hpp"
         "${CMAKE_CURRENT_LIST_DIR}/Noisemaker.hpp"
         "${CMAKE_CURRENT_LIST_DIR}/Spam.hpp"
         "${CMAKE_CURRENT_LIST_DIR}/Trigger.hpp"

include/hacks/CatBot.hpp

@@ -21,4 +21,4 @@ void level_init();
 #if ENABLE_IPC
 void update_ipc_data(ipc::user_data_s &data);
 #endif
-}
+} // namespace hacks::shared::catbot

include/hacks/ESP.hpp

@@ -58,4 +58,4 @@ void AddEntityString(CachedEntity *entity, const std::string &string,
                      const rgba_t &color = colors::empty);
 void SetEntityColor(CachedEntity *entity, const rgba_t &color);
 void ResetEntityStrings();
-}
+} // namespace hacks::shared::esp

include/hacks/FollowBot.hpp

@@ -16,4 +16,4 @@ int ClassPriority(CachedEntity *ent);
 
 bool isEnabled();
 int getTarget();
-}
+} // namespace hacks::shared::followbot

include/hacks/KillSay.hpp

@@ -19,4 +19,4 @@ void reload();
 extern const std::vector<std::string> builtin_default;
 extern const std::vector<std::string> builtin_nonecore_offensive;
 extern const std::vector<std::string> builtin_nonecore_mlg;
-}
+} // namespace hacks::shared::killsay

include/hacks/Killstreak.hpp

@@ -17,4 +17,4 @@ void init();
 void shutdown();
 void fire_event(IGameEvent *event);
 void apply_killstreaks();
-}
+} // namespace hacks::tf2::killstreak

include/hacks/LightESP.hpp

@@ -5,4 +5,4 @@ namespace hacks::shared::lightesp
 void run();
 void draw();
 rgba_t LightESPColor(CachedEntity *ent);
-}
+} // namespace hacks::shared::lightesp

include/hacks/Misc.hpp

@@ -21,4 +21,4 @@ void DrawText();
 extern int last_number;
 
 extern float last_bucket;
-}
+} // namespace hacks::shared::misc

include/hacks/NavBot.hpp

@@ -0,0 +1,12 @@
+//
+// Created by bencat07 on 17.08.18.
+//
+#pragma once
+
+#include "common.hpp"
+#include "config.h"
+namespace hacks::tf2::NavBot
+{
+void Init();
+void CreateMove();
+}

include/hacks/Radar.hpp

@@ -14,5 +14,5 @@ namespace hacks::tf::radar
 {
 std::pair<int, int> WorldToRadar(int x, int y);
 void Draw();
-}
+} // namespace hacks::tf::radar
 #endif

include/hacks/SeedPrediction.hpp

@@ -51,4 +51,4 @@ extern buf2 rebased;
 extern buf3 intervals;
 void selectBase();
 double predictOffset(const seedstruct &entry, int targetTick, double clockRes);
-}
+} // namespace hacks::tf2::seedprediction

include/hacks/SkinChanger.hpp

@@ -137,4 +137,4 @@ void Load(std::string filename, bool merge = false);
 void InvalidateCookie();
 void FrameStageNotify(int stage);
 void DrawText();
-}
+} // namespace hacks::tf2::skinchanger

include/hacks/Spam.hpp

@@ -25,4 +25,4 @@ bool isActive();
 void init();
 void createMove();
 void reload();
-}
+} // namespace hacks::shared::spam

include/hacks/Trigger.hpp

@@ -22,4 +22,4 @@ bool UpdateAimkey();
 float EffectiveTargetingRange();
 void Draw();
 bool CheckLineBox(Vector B1, Vector B2, Vector L1, Vector L2, Vector &Hit);
-}
+} // namespace hacks::shared::triggerbot

include/hacks/UberSpam.hpp

@@ -18,4 +18,4 @@ void CreateMove();
 
 extern const std::vector<std::string> builtin_cathook;
 extern const std::vector<std::string> builtin_nonecore;
-}
+} // namespace hacks::tf::uberspam

include/hacks/Walkbot.hpp

@@ -18,4 +18,4 @@ void Draw();
 #endif
 void Move();
 void OnLevelInit();
-}
+} // namespace hacks::shared::walkbot

include/hacks/ac/aimbot.hpp

@@ -29,4 +29,4 @@ void ResetPlayer(int idx);
 void Init();
 void Update(CachedEntity *player);
 void Event(KeyValues *event);
-}
+} // namespace ac::aimbot

include/hacks/ac/antiaim.hpp

@@ -20,4 +20,4 @@ void ResetPlayer(int idx);
 void Init();
 void Update(CachedEntity *player);
 void Event(KeyValues *event);
-}
+} // namespace ac::antiaim

include/hacks/ac/bhop.hpp

@@ -27,4 +27,4 @@ void ResetPlayer(int idx);
 void Init();
 void Update(CachedEntity *player);
 void Event(KeyValues *event);
-}
+} // namespace ac::bhop

include/hacks/hacklist.hpp

@@ -51,6 +51,7 @@
 #endif
 #include "Spam.hpp"
 #if not LAGBOT_MODE
+#include "NavBot.hpp"
 #include "Noisemaker.hpp"
 #include "FollowBot.hpp"
 #include "Announcer.hpp"

include/hitrate.hpp

@@ -15,4 +15,4 @@ extern int count_hits;
 extern int count_hits_head;
 
 void Update();
-}
+} // namespace hitrate

include/hooks.hpp

@@ -73,4 +73,4 @@ extern VMTHook materialsystem;
 extern VMTHook enginevgui;
 extern VMTHook vstd;
 extern VMTHook eventmanager2;
-}
+} // namespace hooks

include/hooks/HookedMethods.hpp

@@ -88,7 +88,7 @@ DECLARE_HOOKED_METHOD(SDL_PollEvent, int, SDL_Event *);
 // IUniformRandomStream
 DECLARE_HOOKED_METHOD(RandomInt, int, IUniformRandomStream *, int, int);
 #endif
-}
+} // namespace hooked_methods
 
 // TODO
 // wontfix.club

include/https_request.hpp

@@ -37,4 +37,4 @@ public:
 };
 
 void initialize();
-}
+} // namespace https

include/ipc.hpp

@@ -29,7 +29,7 @@ constexpr unsigned execute_client_cmd_long = 3;
 constexpr unsigned move_to_vector          = 4;
 constexpr unsigned stop_moving             = 5;
 constexpr unsigned start_moving            = 6;
-}
+} // namespace commands
 
 constexpr unsigned cathook_magic_number = 0x0DEADCA7;
 
@@ -103,6 +103,6 @@ void UpdateTemporaryData();
 void UpdateServerAddress(bool shutdown = false);
 void StoreClientData();
 void UpdatePlayerlist();
-}
+} // namespace ipc
 
 #endif

include/json.hpp

@@ -208,8 +208,9 @@ using uncvref_t =
 
 // taken from http://stackoverflow.com/a/26936864/266378
 template <typename T>
-using is_unscoped_enum = std::integral_constant<
+using is_unscoped_enum =
-    bool, std::is_convertible<T, int>::value and std::is_enum<T>::value>;
+    std::integral_constant<bool, std::is_convertible<T, int>::value and
+                                     std::is_enum<T>::value>;
 
 /*
 Implementation of two C++17 constructs: conjunction, negation. This is needed
@@ -498,9 +499,8 @@ template <typename BasicJsonType, typename T> struct has_from_json
 {
 private:
     // also check the return type of from_json
-    template <typename U,
+    template <typename U, typename = enable_if_t<std::is_same<
-              typename = enable_if_t<
+                              void, decltype(uncvref_t<U>::from_json(
-                  std::is_same<void, decltype(uncvref_t<U>::from_json(
                                         std::declval<BasicJsonType>(),
                                         std::declval<T &>()))>::value>>
     static int detect(U &&);
@@ -517,9 +517,8 @@ public:
 template <typename BasicJsonType, typename T> struct has_non_default_from_json
 {
 private:
-    template <typename U,
+    template <typename U, typename = enable_if_t<std::is_same<
-              typename = enable_if_t<
+                              T, decltype(uncvref_t<U>::from_json(
-                  std::is_same<T, decltype(uncvref_t<U>::from_json(
                                      std::declval<BasicJsonType>()))>::value>>
     static int detect(U &&);
     static void detect(...);
@@ -969,7 +968,7 @@ namespace
 constexpr const auto &to_json = detail::static_const<detail::to_json_fn>::value;
 constexpr const auto &from_json =
     detail::static_const<detail::from_json_fn>::value;
-}
+} // namespace
 
 /*!
 @brief default JSONSerializer template argument
@@ -3613,15 +3612,15 @@ public:
 
     @since version 1.0.0
     */
-    template <typename ValueType,
+    template <
+        typename ValueType,
         typename std::enable_if<
             not std::is_pointer<ValueType>::value and
                 not std::is_same<ValueType,
                                  typename string_t::value_type>::value
 #ifndef _MSC_VER // fix for issue #167 operator<< ambiguity under VS2015
-                      and
+                and not std::is_same<ValueType,
-                      not std::is_same<
+                                     std::initializer_list<
-                          ValueType, std::initializer_list<
                                          typename string_t::value_type>>::value
 #endif
             ,
@@ -6632,9 +6631,8 @@ public:
         assert(std::accumulate(
                    first, last, std::pair<bool, int>(true, 0),
                    [&first](std::pair<bool, int> res, decltype(*first) val) {
-                       res.first &=
+                       res.first &= (val == *(std::next(std::addressof(*first),
-                           (val ==
+                                                        res.second++)));
-                            *(std::next(std::addressof(*first), res.second++)));
                        return res;
                    })
                    .first);
@@ -11465,8 +11463,7 @@ private:
             @param[in,out] val shall contain parsed value, or undefined value
             if could not parse
             */
-            template <typename T,
+            template <typename T, typename = typename std::enable_if<
-                      typename = typename std::enable_if<
                                       std::is_arithmetic<T>::value>::type>
             bool to(T &val) const
             {

include/navparser.hpp

@@ -11,6 +11,7 @@ extern bool ReadyForCommands;
 extern std::vector<CNavArea> areas;
 std::vector<Vector> findPath(Vector loc, Vector dest);
 bool NavTo(Vector dest, bool navToLocalCenter = true);
+int findClosestNavSquare(Vector vec);
 bool Prepare();
 void CreateMove();
-}
+} // namespace nav

include/online/Online.hpp

@@ -34,4 +34,4 @@ struct user_data
 void update();
 
 user_data *getUserData(unsigned steamId);
-}
+} // namespace online

include/playerlist.hpp

@@ -57,4 +57,4 @@ userdata &AccessData(unsigned steamid);
 userdata &AccessData(CachedEntity *player);
 bool IsDefault(unsigned steamid);
 bool IsDefault(CachedEntity *player);
-}
+} // namespace playerlist

include/reclasses/CTFGCClientSystem.hpp

@@ -25,4 +25,4 @@ public:
     CTFParty *GetParty();
     int JoinMMMatch();
 };
-}
+} // namespace re

include/reclasses/CTFInventoryManager.hpp

@@ -32,4 +32,4 @@ public:
 public:
     CEconItem *GetFirstItemOfItemDef(int id);
 };
-}
+} // namespace re

include/reclasses/CTFParty.hpp

@@ -23,4 +23,4 @@ public:
         return *((int *) party + 19);
     }
 };
-}
+} // namespace re

include/reclasses/CTFPartyClient.hpp

@@ -26,4 +26,4 @@ public:
     int BRequestJoinPlayer(CSteamID steamid);
     static bool BInQueue(CTFPartyClient *this_);
 };
-}
+} // namespace re

include/reclasses/CTFPlayerShared.hpp

@@ -20,4 +20,4 @@ public:
         return false;
     }
 };
-}
+} // namespace re

include/reclasses/C_BaseCombatWeapon.hpp

@@ -37,4 +37,4 @@ public:
             0)(self);
     }
 };
-}
+} // namespace re

include/reclasses/C_BaseEntity.hpp

@@ -39,4 +39,4 @@ public:
         return SetAbsOrigin_fn(self, origin);
     }
 };
-}
+} // namespace re

include/reclasses/C_BasePlayer.hpp

@@ -13,4 +13,4 @@ public:
         return *((CTFPlayerShared *) (unsigned(self) + 6092));
     }
 };
-}
+} // namespace re

include/reclasses/C_MannVsMachineStats.hpp

@@ -20,4 +20,4 @@ public:
 public:
     int *AddLocalPlayerUpgrade(int id, int &a3);
 };
-}
+} // namespace re

include/reclasses/C_TFWeaponBase.hpp

@@ -186,4 +186,4 @@ public:
         return *(float *) (unsigned(self) + 2616u);
     }
 };
-}
+} // namespace re

include/reclasses/C_TFWeaponBaseGun.hpp

@@ -37,4 +37,4 @@ public:
             0)(self);
     }
 };
-}
+} // namespace re

include/reclasses/C_TFWeaponBaseMelee.hpp

@@ -31,4 +31,4 @@ public:
             return (128.0f * 0.67) - 0.5f;
     }
 };
-}
+} // namespace re

include/reclasses/ITFGroupMatchCriteria.hpp

@@ -31,4 +31,4 @@ public:
 public:
     static int SetMatchGroup(ITFGroupMatchCriteria *this_, int group);
 };
-}
+} // namespace re

include/sconvars.hpp

@@ -26,4 +26,4 @@ public:
     ConVar *original;
     ConVar *spoof;
 };
-}
+} // namespace sconvar

include/sdk/netmessage.hpp

@@ -181,7 +181,8 @@ protected:
 
 #define NETMSG_TYPE_BITS 5
 typedef int QueryCvarCookie_t;
-typedef enum {
+typedef enum
+{
     eQueryCvarValueStatus_ValueIntact  = 0, // It got the value fine.
     eQueryCvarValueStatus_CvarNotFound = 1,
     eQueryCvarValueStatus_NotACvar =

include/settings/Bool.hpp

@@ -78,4 +78,4 @@ protected:
     bool value{ false };
     std::string string{ "false" };
 };
-}
+} // namespace settings

include/settings/Float.hpp

@@ -51,4 +51,4 @@ protected:
         string = str;
     }
 };
-}
+} // namespace settings

include/settings/Int.hpp

@@ -43,4 +43,4 @@ public:
         return value != 0;
     }
 };
-}
+} // namespace settings

include/settings/Key.hpp

@@ -139,4 +139,4 @@ protected:
     std::string string{};
     Key value{};
 };
-}
+} // namespace settings

include/settings/Manager.hpp

@@ -46,4 +46,4 @@ public:
 
     std::unordered_map<std::string, VariableDescriptor> registered{};
 };
-}
+} // namespace settings

include/settings/Registered.hpp

@@ -39,4 +39,4 @@ using Button = RegisteredVariableProxy<settings::Key>;
 #if ENABLE_VISUALS
 using Rgba = RegisteredVariableProxy<glez::rgba>;
 #endif
-}
+} // namespace settings

include/settings/Rgba.hpp

@@ -87,4 +87,4 @@ protected:
     glez::rgba value{};
     std::string string{ "00000000" };
 };
-}
+} // namespace settings

include/settings/Settings.hpp

@@ -131,7 +131,7 @@ protected:
         string = std::to_string(value);
     }
 };
-}
+} // namespace settings
 
 #include "Bool.hpp"
 #include "Float.hpp"

include/settings/SettingsIO.hpp

@@ -52,4 +52,4 @@ protected:
     std::ofstream stream{};
     Manager &manager;
 };
-}
+} // namespace settings

include/settings/String.hpp

@@ -49,4 +49,4 @@ public:
 protected:
     std::string value{};
 };
-}
+} // namespace settings

include/tfmm.hpp

@@ -15,4 +15,4 @@ void leaveQueue();
 void disconnectAndAbandon();
 void abandon();
 int getQueue();
-}
+} // namespace tfmm

include/trace.hpp

@@ -60,4 +60,4 @@ public:
 extern FilterDefault filter_default;
 extern FilterNoPlayer filter_no_player;
 extern FilterPenetration filter_penetration;
-}
+} // namespace trace

include/velocity.hpp

@@ -16,4 +16,4 @@ typedef std::function<void(IClientEntity *, Vector &)> EstimateAbsVelocity_t;
 extern EstimateAbsVelocity_t EstimateAbsVelocity;
 
 void Init();
-}
+} // namespace velocity

include/visual/EffectChams.hpp

@@ -54,4 +54,4 @@ public:
 
 extern EffectChams g_EffectChams;
 extern CScreenSpaceEffectRegistration *g_pEffectChams;
-}
+} // namespace effect_chams

include/visual/EffectGlow.hpp

@@ -57,4 +57,4 @@ public:
 
 extern EffectGlow g_EffectGlow;
 extern CScreenSpaceEffectRegistration *g_pEffectGlow;
-}
+} // namespace effect_glow

include/visual/SDLHooks.hpp

@@ -14,4 +14,4 @@ extern SDL_Window *window;
 
 void applySdlHooks();
 void cleanSdlHooks();
-}
+} // namespace sdl_hooks

include/visual/atlas.hpp

@@ -50,4 +50,4 @@ public:
 };
 
 texture_atlas &atlas();
-}
+} // namespace textures