Fix a NavBot issue

This commit is contained in:
LightCat 2018-12-23 16:29:33 +01:00
parent 6dfc3b84f9
commit fb34ab9e27
2 changed files with 1 additions and 154 deletions

View File

@ -1,153 +0,0 @@
# Current dependencies:
# Git
# SDL2
# GLEW
set (CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/external/cotire/CMake")
cmake_policy(SET CMP0011 NEW)
include(cotire)
if(NOT CMAKE_BUILD_TYPE)
set(CMAKE_BUILD_TYPE "Release" CACHE STRING "Build type")
endif()
set(CMAKE_BUILD_TYPE_VALUES "Debug;Release" CACHE INTERNAL "List of supported build")
set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS ${CMAKE_BUILD_TYPE_VALUES})
cmake_minimum_required(VERSION 3.0)
project(cathook VERSION 0.0.1)
set(CMAKE_CXX_STANDARD 17)
add_library(cathook SHARED "")
set(GameSpecific 1 CACHE BOOL "Build for specific target game (As opposed to universal, but slower, lib)")
set(Game "tf2" CACHE STRING "Target game")
set(GameValues "tf2;hl2dm;dab;tf2c;css;dynamic" CACHE INTERNAL "List of supported game types")
set_property(CACHE Game PROPERTY STRINGS ${GameValues})
set(EnableProfiler 0 CACHE BOOL "Enable Profiler")
set(EnableVisuals 1 CACHE BOOL "Enable Visuals")
set(ExternalDrawing 0 CACHE BOOL "External Visuals")
set(EnableGUI 1 CACHE BOOL "Enable GUI")
set(EnableIPC 1 CACHE BOOL "Enable IPC")
set(DataPath "/opt/cathook/data" CACHE FILEPATH "Data location")
set(VACBypass 0 CACHE BOOL "Textmode VAC bypass")
set(Textmode 0 CACHE BOOL "Various textmode-only features for bots")
set(EnableTextmodeStdin 0 CACHE BOOL "Textmode Stdin -> Console bridge (EXPERIMENTAL)")
set(EnableWarnings 0 CACHE BOOL "Enable compile warnings")
set(EnableNullGraphics 0 CACHE BOOL "Enable experimental textmode hooks (CRASHES)")
set(EnableOnlineFeatures 0 CACHE BOOL "Enable online features (WIP)")
set(EnableIRC 1 CACHE BOOL "Enable IRC for messaging and ignore-cathook")
if(NOT EnableVisuals)
set(EnableGUI 0)
endif()
find_package(Git REQUIRED)
find_package(Boost REQUIRED)
# cat packages
execute_process(COMMAND
"${GIT_EXECUTABLE}" log -1 --pretty=\"%h\"
WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
OUTPUT_VARIABLE GIT_COMMIT_HASH
ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE)
execute_process(COMMAND
"${GIT_EXECUTABLE}" log -1 --pretty=\"%ai\"
WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
OUTPUT_VARIABLE GIT_COMMIT_TIME
ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE)
find_library(ValveLibrarySDL2 NAMES libSDL2-2.0.so.0 PATHS "${PROJECT_SOURCE_DIR}/lib" NO_DEFAULT_PATH)
find_library(ValveLibraryTier0 NAMES tier0 PATHS "${PROJECT_SOURCE_DIR}/lib" NO_DEFAULT_PATH)
find_library(ValveLibraryVStdLib NAMES vstdlib PATHS "${PROJECT_SOURCE_DIR}/lib" NO_DEFAULT_PATH)
if(EnableIPC)
add_subdirectory(external/simple-ipc)
target_link_libraries(cathook SimpleIPC)
endif()
if(EnableOnlineFeatures)
add_subdirectory(external/co-library)
target_link_libraries(cathook co-library)
endif()
if(EnableVisuals)
add_subdirectory(external/libglez)
target_include_directories(cathook PRIVATE include/visual)
find_package(SDL2 REQUIRED)
find_package(GLEW REQUIRED)
if(ExternalDrawing)
add_subdirectory(external/libxoverlay)
target_link_libraries(cathook xoverlay)
target_include_directories(cathook PRIVATE external/libxoverlay/include)
endif()
target_include_directories(cathook PRIVATE "${SDL2_INCLUDE_DIRS}")
target_link_libraries(cathook glez ${ValveLibrarySDL2} ${GLEW_LIBRARIES})
endif()
configure_file(include/config.h.in ${CMAKE_SOURCE_DIR}/include/config.h @ONLY)
configure_file(include/version.h.in ${CMAKE_SOURCE_DIR}/include/version.h @ONLY)
set(CMAKE_CXX_FLAGS "-m32 -msse -msse2 -msse3 -fexceptions -fno-gnu-unique -DNDEBUG -Og -rdynamic -ggdb")
set(CMAKE_CXX_FLAGS_DEBUG "")
set(CMAKE_CXX_FLAGS_RELEASE "")
target_compile_definitions(cathook PRIVATE
_GLIBCXX_USE_CXX11_ABI=0
_POSIX=1
FREETYPE_GL_USE_VAO=1
RAD_TELEMETRY_DISABLED=1
LINUX=1
USE_SDL=1
_LINUX=1
POSIX=1
GNUC=1
NO_MALLOC_OVERRIDE=1)
target_include_directories(cathook SYSTEM PRIVATE
"external/source-sdk-2013-headers/mp/src/mathlib"
"external/source-sdk-2013-headers/mp/src/public"
"external/source-sdk-2013-headers/mp/src/common"
"external/source-sdk-2013-headers/mp/src/public/tier0"
"external/source-sdk-2013-headers/mp/src/public/tier1"
"external/source-sdk-2013-headers/mp/src/tier1"
"external/source-sdk-2013-headers/mp/src")
if(EnableWarnings)
target_compile_options(cathook PRIVATE -Wall -Wextra)
else()
target_compile_options(cathook PRIVATE -w)
endif()
target_include_directories(cathook PRIVATE include include/hooks)
add_custom_target(data
bash ./install-data "${DataPath}"
WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
VERBATIM)
# TODO glez_LIBRARIES?
target_link_libraries(cathook ${ValveLibraryTier0} ${ValveLibraryVStdLib})
set_target_properties(cathook PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
add_subdirectory(src)
add_subdirectory(include)
add_subdirectory(external)
add_subdirectory(modules)
set_target_properties(cathook PROPERTIES COTIRE_CXX_PREFIX_HEADER_INIT "${CMAKE_SOURCE_DIR}/include/common.hpp")
set_target_properties(cathook PROPERTIES COTIRE_ADD_UNITY_BUILD FALSE)
cotire(cathook)
add_custom_command(TARGET cathook POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:cathook> "${CMAKE_SOURCE_DIR}/bin/$<TARGET_FILE_NAME:cathook>")
# Strip
if(CMAKE_BUILD_TYPE STREQUAL "Release")
message("Stripping info from library")
add_custom_command(TARGET cathook POST_BUILD
COMMAND strip --strip-all "${CMAKE_SOURCE_DIR}/bin/$<TARGET_FILE_NAME:cathook>")
endif()

View File

@ -118,7 +118,7 @@ static std::pair<CachedEntity *, float> getNearestPlayerDistance()
for (int i = 1; i < g_IEngine->GetMaxClients(); i++)
{
CachedEntity *ent = ENTITY(i);
if (CE_GOOD(ent) && ent->m_bAlivePlayer() && ent->m_bEnemy() && g_pLocalPlayer->v_Origin.DistTo(ent->m_vecOrigin()) < distance && player_tools::shouldTarget(ent) == player_tools::IgnoreReason::DO_NOT_IGNORE && (hacks::shared::aimbot::ignore_cloak || !IsPlayerInvisible(ent)) && VisCheckEntFromEnt(LOCAL_E, ent))
if (CE_GOOD(ent) && ent->m_bAlivePlayer() && ent->m_bEnemy() && g_pLocalPlayer->v_Origin.DistTo(ent->m_vecOrigin()) < distance && player_tools::shouldTarget(ent) == player_tools::IgnoreReason::DO_NOT_IGNORE && (!hacks::shared::aimbot::ignore_cloak || !IsPlayerInvisible(ent)) && VisCheckEntFromEnt(LOCAL_E, ent))
{
distance = g_pLocalPlayer->v_Origin.DistTo(ent->m_vecOrigin());
best_ent = ent;