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

@@ -44,13 +44,13 @@ SOFTWARE.
 #include <initializer_list> // initializer_list
 #include <iomanip>          // setw
 #include <iostream>         // istream, ostream
-#include <iterator>         // advance, begin, back_inserter, bidirectional_iterator_tag, distance, end, inserter, iterator, iterator_traits, next, random_access_iterator_tag, reverse_iterator
+#include <iterator> // advance, begin, back_inserter, bidirectional_iterator_tag, distance, end, inserter, iterator, iterator_traits, next, random_access_iterator_tag, reverse_iterator
-#include <limits>           // numeric_limits
+#include <limits>   // numeric_limits
-#include <locale>           // locale
+#include <locale>   // locale
-#include <map>              // map
+#include <map>      // map
-#include <memory>      // addressof, allocator, allocator_traits, unique_ptr
+#include <memory>   // addressof, allocator, allocator_traits, unique_ptr
-#include <numeric>     // accumulate
+#include <numeric>  // accumulate
-#include <sstream>     // stringstream
+#include <sstream>  // stringstream
 #include <stdexcept>   // domain_error, invalid_argument, out_of_range
 #include <string>      // getline, stoi, string, to_string
 #include <type_traits> // add_pointer, conditional, decay, enable_if, false_type, integral_constant, is_arithmetic, is_base_of, is_const, is_constructible, is_convertible, is_default_constructible, is_enum, is_floating_point, is_integral, is_nothrow_move_assignable, is_nothrow_move_constructible, is_pointer, is_reference, is_same, is_scalar, is_signed, remove_const, remove_cv, remove_pointer, remove_reference, true_type, underlying_type
@@ -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,11 +499,10 @@ 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<BasicJsonType>(),
+                                        std::declval<T &>()))>::value>>
-                                         std::declval<T &>()))>::value>>
     static int detect(U &&);
     static void detect(...);
 
@@ -517,10 +517,9 @@ 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>>
-                                      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
@@ -1226,7 +1225,7 @@ public:
 #ifdef _WIN32
         result["platform"] = "win32";
 #elif defined __linux__
-        result["platform"] = "linux";
+        result["platform"]        = "linux";
 #elif defined __APPLE__
         result["platform"] = "apple";
 #elif defined __unix__
@@ -1239,7 +1238,7 @@ public:
         result["compiler"] = { { "family", "clang" },
                                { "version", __clang_version__ } };
 #elif defined(__ICC) || defined(__INTEL_COMPILER)
-        result["compiler"] = { { "family", "icc" },
+        result["compiler"]        = { { "family", "icc" },
                                { "version", __INTEL_COMPILER } };
 #elif defined(__GNUC__) || defined(__GNUG__)
         result["compiler"] = { { "family", "gcc" },
@@ -3391,7 +3390,7 @@ public:
     */
     template <
         typename ValueTypeCV,
-        typename ValueType = detail::uncvref_t<ValueTypeCV>,
+        typename ValueType       = detail::uncvref_t<ValueTypeCV>,
         detail::enable_if_t<not std::is_same<basic_json_t, ValueType>::value and
                                 detail::has_non_default_from_json<
                                     basic_json_t, ValueType>::value,
@@ -3613,19 +3612,19 @@ public:
 
     @since version 1.0.0
     */
-    template <typename ValueType,
+    template <
-              typename std::enable_if<
+        typename ValueType,
-                  not std::is_pointer<ValueType>::value and
+        typename std::enable_if<
-                      not std::is_same<ValueType,
+            not std::is_pointer<ValueType>::value and
-                                       typename string_t::value_type>::value
+                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
-                  ,
+            ,
-                  int>::type = 0>
+            int>::type = 0>
     operator ValueType() const
     {
         // delegate the call to get<>() const
@@ -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);
@@ -10299,7 +10297,7 @@ private:
                     }
                 basic_json_parser_9:
                     yyaccept = 0;
-                    yych = *(m_marker = ++m_cursor);
+                    yych     = *(m_marker = ++m_cursor);
                     if (yych <= 0x1F)
                     {
                         goto basic_json_parser_5;
@@ -10340,7 +10338,7 @@ private:
                     goto basic_json_parser_5;
                 basic_json_parser_13:
                     yyaccept = 1;
-                    yych = *(m_marker = ++m_cursor);
+                    yych     = *(m_marker = ++m_cursor);
                     if (yych <= '9')
                     {
                         if (yych == '.')
@@ -10426,7 +10424,7 @@ private:
                     }
                 basic_json_parser_23:
                     yyaccept = 0;
-                    yych = *(m_marker = ++m_cursor);
+                    yych     = *(m_marker = ++m_cursor);
                     if (yych == 'a')
                     {
                         goto basic_json_parser_52;
@@ -10434,7 +10432,7 @@ private:
                     goto basic_json_parser_5;
                 basic_json_parser_24:
                     yyaccept = 0;
-                    yych = *(m_marker = ++m_cursor);
+                    yych     = *(m_marker = ++m_cursor);
                     if (yych == 'u')
                     {
                         goto basic_json_parser_53;
@@ -10442,7 +10440,7 @@ private:
                     goto basic_json_parser_5;
                 basic_json_parser_25:
                     yyaccept = 0;
-                    yych = *(m_marker = ++m_cursor);
+                    yych     = *(m_marker = ++m_cursor);
                     if (yych == 'r')
                     {
                         goto basic_json_parser_54;
@@ -10748,7 +10746,7 @@ private:
                     goto basic_json_parser_32;
                 basic_json_parser_43:
                     yyaccept = 2;
-                    yych = *(m_marker = ++m_cursor);
+                    yych     = *(m_marker = ++m_cursor);
                     if (yych <= '9')
                     {
                         if (yych == '.')
@@ -11465,9 +11463,8 @@ 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>
-                          std::is_arithmetic<T>::value>::type>
             bool to(T &val) const
             {
                 return parse(val, std::is_integral<T>());
@@ -12517,7 +12514,7 @@ public:
                  pos != std::string::npos;       // make sure f was found
                  s.replace(pos, f.size(), t),    // replace with t
                  pos = s.find(f, pos + t.size()) // find next occurrence of f
-                 )
+            )
                 ;
         }
 

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

@@ -26,7 +26,7 @@ enum class k_EState
 };
 
 extern rgba_t k_Colors[];
-const std::string k_Names[] = { "DEFAULT", "FRIEND", "RAGE", "IPC",
+const std::string k_Names[]    = { "DEFAULT", "FRIEND", "RAGE", "IPC",
                                 "DEVELOPER" };
 const char *const k_pszNames[] = { "DEFAULT", "FRIEND", "RAGE", "IPC",
                                    "DEVELOPER" };
@@ -57,4 +57,4 @@ userdata &AccessData(unsigned steamid);
 userdata &AccessData(CachedEntity *player);
 bool IsDefault(unsigned steamid);
 bool IsDefault(CachedEntity *player);
-}
+} // namespace playerlist

include/prediction.hpp

@@ -1,9 +1,9 @@
 /*
-*prediction.h
+ *prediction.h
-*
+ *
-* Created on: Dec 5, 2016
+ * Created on: Dec 5, 2016
-*     Author: nullifiedcat
+ *     Author: nullifiedcat
-*/
+ */
 
 #pragma once
 

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/igamemovement.h

@@ -120,9 +120,9 @@ public:
 
     // Process the current movement command
     virtual void ProcessMovement(CBasePlayer * pPlayer, CMoveData * pMove) = 0;
-    virtual void StartTrackPredictionErrors(CBasePlayer * pPlayer)  = 0;
+    virtual void StartTrackPredictionErrors(CBasePlayer * pPlayer)         = 0;
-    virtual void FinishTrackPredictionErrors(CBasePlayer * pPlayer) = 0;
+    virtual void FinishTrackPredictionErrors(CBasePlayer * pPlayer)        = 0;
-    virtual void DiffPrint(PRINTF_FORMAT_STRING char const *fmt, ...) = 0;
+    virtual void DiffPrint(PRINTF_FORMAT_STRING char const *fmt, ...)      = 0;
 
     // Allows other parts of the engine to find out the normal and ducked player
     // bbox sizes

include/sdk/iinput.h

@@ -37,10 +37,10 @@ public:
     virtual int GetButtonBits(int) = 0;
     // Create movement command
     virtual void CreateMove(int sequence_number, float input_sample_frametime,
-                            bool active) = 0;
+                            bool active)                         = 0;
-    virtual void ExtraMouseSample(float frametime, bool active) = 0;
+    virtual void ExtraMouseSample(float frametime, bool active)  = 0;
     virtual bool WriteUsercmdDeltaToBuffer(bf_write *buf, int from, int to,
-                                           bool isnewcommand) = 0;
+                                           bool isnewcommand)    = 0;
     virtual void EncodeUserCmdToBuffer(bf_write &buf, int slot)  = 0;
     virtual void DecodeUserCmdFromBuffer(bf_read &buf, int slot) = 0;
 
@@ -77,13 +77,13 @@ public:
     // Retrieve mouse position
     virtual void GetFullscreenMousePos(int *mx, int *my, int *unclampedx = 0,
                                        int *unclampedy = 0) = 0;
-    virtual void SetFullscreenMousePos(int mx, int my) = 0;
+    virtual void SetFullscreenMousePos(int mx, int my)      = 0;
-    virtual void ResetMouse(void)           = 0;
+    virtual void ResetMouse(void)                           = 0;
-    virtual float GetLastForwardMove(void)  = 0;
+    virtual float GetLastForwardMove(void)                  = 0;
-    virtual float Joystick_GetForward(void) = 0;
+    virtual float Joystick_GetForward(void)                 = 0;
-    virtual float Joystick_GetSide(void)    = 0;
+    virtual float Joystick_GetSide(void)                    = 0;
-    virtual float Joystick_GetPitch(void)   = 0;
+    virtual float Joystick_GetPitch(void)                   = 0;
-    virtual float Joystick_GetYaw(void)     = 0;
+    virtual float Joystick_GetYaw(void)                     = 0;
 
     // Third Person camera ( TODO/FIXME:  Move this to a separate interface? )
     virtual void CAM_Think(void)            = 0;
@@ -98,8 +98,8 @@ public:
 
     // orthographic camera info	( TODO/FIXME:  Move this to a separate
     // interface? )
-    virtual void CAM_ToOrthographic()       = 0;
+    virtual void CAM_ToOrthographic()                           = 0;
-    virtual bool CAM_IsOrthographic() const = 0;
+    virtual bool CAM_IsOrthographic() const                     = 0;
     virtual void CAM_OrthographicSize(float &w, float &h) const = 0;
 
 #if defined(HL2_CLIENT_DLL)

include/sdk/imaterialsystemfixed.h

@@ -167,7 +167,7 @@ public:
     // Get the image format of the back buffer. . useful when creating render
     // targets, etc.
     virtual void GetBackBufferDimensions(int &width, int &height) const = 0;
-    virtual ImageFormat GetBackBufferFormat() const = 0;
+    virtual ImageFormat GetBackBufferFormat() const                     = 0;
 
     virtual bool SupportsHDRMode(HDRType_t nHDRModede) = 0;
 
@@ -186,8 +186,8 @@ public:
     // Control flow
     // -----------------------------------------------------------
 
-    virtual void BeginFrame(float frameTime) = 0;
+    virtual void BeginFrame(float frameTime)       = 0;
-    virtual void EndFrame()                  = 0;
+    virtual void EndFrame()                        = 0;
     virtual void Flush(bool flushHardware = false) = 0;
 
     /// FIXME: This stuff needs to be cleaned up and abstracted.
@@ -226,7 +226,7 @@ public:
 
     // Used to iterate over all shaders for editing purposes
     // GetShaders returns the number of shaders it actually found
-    virtual int ShaderCount() const = 0;
+    virtual int ShaderCount() const                      = 0;
     virtual int GetShaders(int nFirstShader, int nMaxCount,
                            IShader **ppShaderList) const = 0;
 
@@ -470,15 +470,15 @@ public:
     virtual void ClearBuffers(bool bClearColor, bool bClearDepth,
                               bool bClearStencil = false) = 0;
 
-// -----------------------------------------------------------
+    // -----------------------------------------------------------
-// X360 specifics
+    // X360 specifics
-// -----------------------------------------------------------
+    // -----------------------------------------------------------
 
 #if defined(_X360)
-    virtual void ListUsedMaterials(void) = 0;
+    virtual void ListUsedMaterials(void)                                 = 0;
     virtual HXUIFONT OpenTrueTypeFont(const char *pFontname, int tall,
-                                      int style)   = 0;
+                                      int style)                         = 0;
-    virtual void CloseTrueTypeFont(HXUIFONT hFont) = 0;
+    virtual void CloseTrueTypeFont(HXUIFONT hFont)                       = 0;
     virtual bool GetTrueTypeFontMetrics(HXUIFONT hFont,
                                         XUIFontMetrics * pFontMetrics,
                                         XUICharMetrics charMetrics[256]) = 0;
@@ -536,7 +536,7 @@ public:
     virtual ImageFormat GetNullTextureFormat() = 0;
 
     virtual void AddTextureAlias(const char *pAlias, const char *pRealName) = 0;
-    virtual void RemoveTextureAlias(const char *pAlias) = 0;
+    virtual void RemoveTextureAlias(const char *pAlias)                     = 0;
 
     // returns a lightmap page ID for this allocation, -1 if none available
     // frameID is a number that should be changed every frame to prevent locking
@@ -553,7 +553,7 @@ public:
 
     // For sv_pure mode. The filesystem figures out which files the client needs
     // to reload to be "pure" ala the server's preferences.
-    virtual void ReloadFilesInList(IFileList * pFilesToReload) = 0;
+    virtual void ReloadFilesInList(IFileList * pFilesToReload)   = 0;
     virtual bool AllowThreading(bool bAllow, int nServiceThread) = 0;
 
     // Extended version of FindMaterial().

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