Merge remote-tracking branch 'nullworks/newui' into Pathfinder

.autotools

@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configurations>
+<configuration id="org.eclipse.linuxtools.cdt.autotools.core.configuration.build.1853436091">
+<option id="configure" value="configure"/>
+<option id="configdir" value=""/>
+<option id="cache-file" value=""/>
+<option id="help" value="false"/>
+<option id="no-create" value="false"/>
+<option id="quiet" value="false"/>
+<option id="version" value="false"/>
+<option id="host" value=""/>
+<option id="build" value=""/>
+<option id="target" value=""/>
+<option id="prefix" value=""/>
+<option id="exec-prefix" value=""/>
+<option id="libdir" value=""/>
+<option id="bindir" value=""/>
+<option id="sbindir" value=""/>
+<option id="includedir" value=""/>
+<option id="datadir" value=""/>
+<option id="sysconfdir" value=""/>
+<option id="infodir" value=""/>
+<option id="mandir" value=""/>
+<option id="srcdir" value=""/>
+<option id="localstatedir" value=""/>
+<option id="sharedstatedir" value=""/>
+<option id="libexecdir" value=""/>
+<option id="oldincludedir" value=""/>
+<option id="program-prefix" value=""/>
+<option id="program-suffix" value=""/>
+<option id="program-transform-name" value=""/>
+<option id="env_vars" value=""/>
+<option id="enable-maintainer-mode" value="false"/>
+<flag id="CFLAGS" value="CFLAGS|CXXFLAGS">
+<flagvalue id="cflags-debug" value="false"/>
+<flagvalue id="cflags-gprof" value="false"/>
+<flagvalue id="cflags-gcov" value="false"/>
+</flag>
+<option id="user" value=""/>
+<option id="autogen" value="autogen.sh"/>
+<option id="autogenOpts" value=""/>
+</configuration>
+<configuration id="org.eclipse.linuxtools.cdt.autotools.core.configuration.build.debug.1487733959">
+<option id="configure" value="configure"/>
+<option id="configdir" value=""/>
+<option id="cache-file" value=""/>
+<option id="help" value="false"/>
+<option id="no-create" value="false"/>
+<option id="quiet" value="false"/>
+<option id="version" value="false"/>
+<option id="host" value=""/>
+<option id="build" value=""/>
+<option id="target" value=""/>
+<option id="prefix" value=""/>
+<option id="exec-prefix" value=""/>
+<option id="libdir" value=""/>
+<option id="bindir" value=""/>
+<option id="sbindir" value=""/>
+<option id="includedir" value=""/>
+<option id="datadir" value=""/>
+<option id="sysconfdir" value=""/>
+<option id="infodir" value=""/>
+<option id="mandir" value=""/>
+<option id="srcdir" value=""/>
+<option id="localstatedir" value=""/>
+<option id="sharedstatedir" value=""/>
+<option id="libexecdir" value=""/>
+<option id="oldincludedir" value=""/>
+<option id="program-prefix" value=""/>
+<option id="program-suffix" value=""/>
+<option id="program-transform-name" value=""/>
+<option id="env_vars" value=""/>
+<option id="enable-maintainer-mode" value="false"/>
+<flag id="CFLAGS" value="CFLAGS|CXXFLAGS">
+<flagvalue id="cflags-debug" value="false"/>
+<flagvalue id="cflags-gprof" value="false"/>
+<flagvalue id="cflags-gcov" value="false"/>
+</flag>
+<option id="user" value="CFLAGS=&apos;-g -O0&apos; CXXFLAGS=&apos;-g -O0&apos;"/>
+<option id="autogen" value="autogen.sh"/>
+<option id="autogenOpts" value=""/>
+</configuration>
+</configurations>

.gitmodules

@@ -16,9 +16,9 @@
 [submodule "external/co-library"]
 	path = external/co-library
 	url = https://github.com/nullworks/co-library.git
-[submodule "external/TF2_NavFile_Reader"]
-	path = external/TF2_NavFile_Reader
-	url = https://github.com/nullworks/TF2_NavFile_Reader
-[submodule "external/PathFinder"]
-	path = external/PathFinder
-	url = https://github.com/Sahnvour/PathFinder
+[submodule "include/TF2_NavFile_Reader"]
+	path = include/TF2_NavFile_Reader
+	url = https://github.com/nullworks/TF2_NavFile_Reader.git
+[submodule "external/MicroPather"]
+	path = external/MicroPather
+	url = https://github.com/leethomason/MicroPather

CMakeLists.txt

@@ -111,8 +111,7 @@ target_include_directories(cathook SYSTEM PRIVATE
         "external/source-sdk-2013-headers/mp/src")
 
 target_include_directories(cathook PRIVATE "external/ucccccp")
-target_include_directories(cathook PRIVATE "external/TF2_NavFile_Reader")
-target_include_directories(cathook PRIVATE "external/PathFinder/src/")
+target_include_directories(cathook PRIVATE "external/MicroPather")
 
 if(EnableWarnings)
     target_compile_options(cathook PRIVATE -Wall -Wextra)

external/MicroPather

@@ -0,0 +1 @@
+Subproject commit 33a3b8403f1bc3937c9d364fe6c3977169bee3b5

include/CMakeLists.txt

@@ -39,6 +39,7 @@ target_sources(cathook PRIVATE
         "${CMAKE_CURRENT_LIST_DIR}/velocity.hpp"
         "${CMAKE_CURRENT_LIST_DIR}/votelogger.hpp"
         "${CMAKE_CURRENT_LIST_DIR}/MiscTemporary.hpp"
+	"${CMAKE_CURRENT_LIST_DIR}/navparser.hpp"
         "${CMAKE_CURRENT_LIST_DIR}/Options.hpp"
         "${CMAKE_CURRENT_LIST_DIR}/PlayerTools.hpp")
 
@@ -49,6 +50,7 @@ add_subdirectory(classinfo)
 add_subdirectory(copypasted)
 add_subdirectory(hacks)
 add_subdirectory(hooks)
+add_subdirectory(TF2_NavFile_Reader)
 add_subdirectory(reclasses)
 add_subdirectory(sdk)
 add_subdirectory(online)
@@ -56,4 +58,5 @@ add_subdirectory(settings)
 
 if(EnableVisuals)
     add_subdirectory(visual)
-endif()
+endif()
+

include/TF2_NavFile_Reader

@@ -0,0 +1 @@
+Subproject commit 65818ea2cda4fa3f8e3f17e272692543f704d1f4

include/common.hpp

@@ -98,6 +98,8 @@
 #include "core/sharedobj.hpp"
 #include "init.hpp"
 #include "reclasses/reclasses.hpp"
+#include <CNavFile.h>
+#include <astar.h>
 
 #include "copypasted/Netvar.h"
 #include "copypasted/CSignature.h"

include/hacks/Backtrack.hpp

@@ -25,6 +25,7 @@ struct BacktrackData
     float viewangles{ 0.0f };
     float simtime{ 0.0f };
     Vector entorigin{ 0.0f, 0.0f, 0.0f };
+    int index{ 0 };
 };
 struct BestTickData
 {