Add Mistral.

First commit of a new fork.

Author: MistralDev

CMakeLists.txt

@@ -1,12 +1,12 @@
-cmake_minimum_required(VERSION 3.10)
+cmake_minimum_required(VERSION 3.21.0)
 
 set(EnablePrecompiledHeaders 1 CACHE BOOL "Enable Precompiled Headers to reduce compile time")
-if(${CMAKE_VERSION} VERSION_LESS "3.16.0")
+if (${CMAKE_VERSION} VERSION_LESS "3.16.0")
     unset(NativePrecompiledHeaders)
-else()
+else ()
     set(NativePrecompiledHeaders 1)
     unset(EnableCotire CACHE)
-endif()
+endif ()
 
 # Ensure that only 32 bit libraries are used.
 set(CMAKE_TOOLCHAIN_FILE "${CMAKE_SOURCE_DIR}/Toolchain-cross-m32.cmake")
@@ -15,9 +15,9 @@ set(CMAKE_TOOLCHAIN_FILE "${CMAKE_SOURCE_DIR}/Toolchain-cross-m32.cmake")
 # Config stuff
 #
 
-if(NOT CMAKE_BUILD_TYPE)
+if (NOT CMAKE_BUILD_TYPE)
     set(CMAKE_BUILD_TYPE "Release" CACHE STRING "Build type")
-endif()
+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})
 
@@ -26,11 +26,6 @@ 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(Visuals_DrawType "IMGUI" CACHE STRING "Target drawing api")
 set(DrawTypes "Textmode;No Visuals;Glez;Engine;IMGUI;IMGUI Streamproof" CACHE INTERNAL "Select the drawing api that cathook should use")
 set_property(CACHE Visuals_DrawType PROPERTY STRINGS ${DrawTypes})
@@ -43,24 +38,24 @@ set(EnableImGuiDrawing 0)
 set(ExternalDrawing 0)
 set(Textmode 0)
 
-if(Visuals_DrawType STREQUAL "Textmode")
+if (Visuals_DrawType STREQUAL "Textmode")
     set(EnableVisuals 0)
     set(Textmode 1)
-elseif(Visuals_DrawType STREQUAL "No Visuals")
+elseif (Visuals_DrawType STREQUAL "No Visuals")
     set(EnableVisuals 0)
-elseif(Visuals_DrawType STREQUAL "Glez")
+elseif (Visuals_DrawType STREQUAL "Glez")
     set(EnableGlezDrawing 1)
-elseif(Visuals_DrawType STREQUAL "Engine")
+elseif (Visuals_DrawType STREQUAL "Engine")
     set(EnableEngineDrawing 1)
-elseif(Visuals_DrawType STREQUAL "IMGUI")
+elseif (Visuals_DrawType STREQUAL "IMGUI")
     set(EnableImGuiDrawing 1)
-elseif(Visuals_DrawType STREQUAL "IMGUI Streamproof")
+elseif (Visuals_DrawType STREQUAL "IMGUI Streamproof")
     set(EnableImGuiDrawing 1)
     set(ExternalDrawing 1)
-endif()
+endif ()
 if (NOT ExternalDrawing)
     set(Visuals_EnforceStreamSafety 0)
-endif()
+endif ()
 
 set(EnableProfiler 0 CACHE BOOL "Enable Profiler")
 set(EnableGUI 1 CACHE BOOL "Enable GUI")
@@ -73,18 +68,18 @@ set(EnableNullNexus 1 CACHE BOOL "Enable NullNexus chat and other features")
 set(EnableLogging 1 CACHE BOOL "Enable logging to /tmp/")
 set(EnableClip 1 CACHE BOOL "Enable anti electron/chromium freezing")
 set(Unity_ZeroKernel 1 CACHE BOOL "Use a unity build for zerokernel files")
-if(NOT EnableVisuals)
+if (NOT EnableVisuals)
     set(EnableGUI 0)
-endif()
+endif ()
 
 # Internal variables
 # INTERNAL implies "FORCE" by default, so don't set if already set
 if (NOT DEFINED Internal_Binarymode)
     set(Internal_Binarymode 0 CACHE INTERNAL "Build cathook to be used in 'binary mode'")
-endif()
+endif ()
 if (NOT DEFINED Internal_Symbolized)
     set(Internal_Symbolized 0 CACHE INTERNAL "Build cathook with symbols so crashes can be sent")
-endif()
+endif ()
 
 #
 # End of config stuff
@@ -96,8 +91,8 @@ if (EnableVisuals)
         find_package(Freetype REQUIRED)
         target_include_directories(cathook PRIVATE "${FREETYPE_INCLUDE_DIRS}")
         target_link_libraries(cathook ${FREETYPE_LIBRARIES})
-    endif()
-endif()
+    endif ()
+endif ()
 
 find_package(Git REQUIRED)
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/external")
@@ -106,10 +101,10 @@ find_package(Boost 1.70.0)
 if (NOT ${Boost_FOUND})
     set(BOOST_LIBS_OPTIONAL "" CACHE STRING "Boost libs to be compiled")
     add_subdirectory(external/boost-cmake)
-    SET (BOOST_ROOT ${CMAKE_BINARY_DIR}/_deps/boost-src)
+    SET(BOOST_ROOT ${CMAKE_BINARY_DIR}/_deps/boost-src)
     find_package(Boost 1.70 REQUIRED)
     include_directories(${Boost_INCLUDE_DIRS})
-endif()
+endif ()
 
 execute_process(COMMAND
         "${GIT_EXECUTABLE}" log -1 --pretty=\"%h\"
@@ -123,50 +118,50 @@ execute_process(COMMAND
         OUTPUT_VARIABLE GIT_COMMITTER_DATE
         ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE)
 
-set( CMAKE_SKIP_RPATH true )
+set(CMAKE_SKIP_RPATH true)
 find_library(ValveLibraryVStdLib NAMES vstdlib PATHS "${PROJECT_SOURCE_DIR}/lib" NO_DEFAULT_PATH)
 
-if(EnableIPC)
+if (EnableIPC)
     add_subdirectory(external/simple-ipc)
     target_link_libraries(cathook SimpleIPC)
-endif()
+endif ()
 
-if(EnableNullNexus)
+if (EnableNullNexus)
     add_subdirectory(external/libnullnexus)
     target_link_libraries(cathook libnullnexus)
-endif()
+endif ()
 
-if(EnableVisuals)
+if (EnableVisuals)
     if (EnableGlezDrawing)
         add_subdirectory(external/libglez)
-    endif()
+    endif ()
     target_include_directories(cathook PRIVATE include/visual)
     find_package(SDL2 REQUIRED)
-    if(ExternalDrawing)
+    if (ExternalDrawing)
         add_subdirectory(external/libxoverlay)
         target_link_libraries(cathook xoverlay)
         target_include_directories(cathook PRIVATE external/libxoverlay/include)
-    endif()
+    endif ()
     target_include_directories(cathook PRIVATE "${SDL2_INCLUDE_DIR}")
     if (EnableGlezDrawing)
         target_link_libraries(cathook glez)
-    endif()
+    endif ()
     if (EnableGlezDrawing)
         find_package(GLEW REQUIRED)
         target_link_libraries(cathook ${GLEW_LIBRARIES})
-    endif()
-endif()
+    endif ()
+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 -march=native -fexceptions -fno-gnu-unique -DNDEBUG")
-set(CMAKE_CXX_FLAGS_DEBUG "-rdynamic -ggdb -Og")
+set(CMAKE_CXX_FLAGS "-m32 -mavx2 -O3 -fexceptions -fno-gnu-unique -DNDEBUG")
+set(CMAKE_CXX_FLAGS_DEBUG "-m32 -mavx2 -Og -rdynamic -ggdb")
 if (Internal_Symbolized)
-    set(CMAKE_CXX_FLAGS_RELEASE "-O3 -ggdb -fvisibility=hidden -fvisibility-inlines-hidden")
-else()
-    set(CMAKE_CXX_FLAGS_RELEASE "-O3 -s -fvisibility=hidden -fvisibility-inlines-hidden")
-endif()
+    set(CMAKE_CXX_FLAGS_RELEASE "-m32 -mavx2 -O3 -ggdb -fvisibility=hidden -fvisibility-inlines-hidden")
+else ()
+    set(CMAKE_CXX_FLAGS_RELEASE "-m32 -mavx2 -O3 -s -fvisibility=hidden -fvisibility-inlines-hidden")
+endif ()
 
 target_compile_definitions(cathook PRIVATE
         _GLIBCXX_USE_CXX11_ABI=0
@@ -189,14 +184,14 @@ target_include_directories(cathook SYSTEM PRIVATE
         "external/source-sdk-2013-headers/mp/src/tier1"
         "external/source-sdk-2013-headers/mp/src")
 
-if(EnableWarnings)
+if (EnableWarnings)
     target_compile_options(cathook PRIVATE -Wall -Wextra -Wno-unused-parameter -Wno-class-memaccess -Wno-strict-aliasing -Wno-sign-compare)
-else()
+else ()
     target_compile_options(cathook PRIVATE -w)
-endif()
-if(Internal_Binarymode)
+endif ()
+if (Internal_Binarymode)
     target_compile_options(cathook PRIVATE -march=x86-64)
-endif()
+endif ()
 
 
 target_include_directories(cathook PRIVATE include include/hooks)
@@ -215,14 +210,14 @@ add_subdirectory(include)
 add_subdirectory(external)
 add_subdirectory(modules)
 
-if(EnablePrecompiledHeaders AND NativePrecompiledHeaders)
+if (EnablePrecompiledHeaders AND NativePrecompiledHeaders)
     target_precompile_headers(cathook PRIVATE "${CMAKE_SOURCE_DIR}/include/common.hpp")
-endif()
+endif ()
 
 if (NOT Internal_Symbolized)
     add_custom_command(TARGET cathook POST_BUILD
-        COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:cathook> "${CMAKE_SOURCE_DIR}/bin/$<TARGET_FILE_NAME:cathook>")
-else()
+            COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:cathook> "${CMAKE_SOURCE_DIR}/bin/$<TARGET_FILE_NAME:cathook>")
+else ()
     message("Symbolized build")
     set(Internal_Symbolized 0 CACHE INTERNAL "Build cathook with symbols so crashes can be sent" FORCE)
-endif()
+endif ()

CODE_OF_CONDUCT.md

@@ -1,6 +1,6 @@
 # Contributor Code of Conduct
 
-This project adheres to No Code of Conduct.  We are all adults.  We accept anyone's contributions.  Nothing else matters.
+This project adheres to No Code of Conduct. We are all adults. We accept anyone's contributions. Nothing else matters.
 
 For more information please visit the [No Code of Conduct](https://github.com/domgetter/NCoC) homepage.
 

CONTRIBUTING.md

@@ -5,24 +5,31 @@
 - A working up-to-date cathook installation
 - C++ knowledge
 - Git knowledge
-- Ability to ask for help (Feel free to create empty pull-request or PM a maintainer in [Telegram](https://t.me/nullworks))
+- Ability to ask for help (Feel free to create empty pull-request or PM a maintainer
+  in [Telegram](https://t.me/nullworks))
 
 ### Setting up cathook
 
-Cathook reduces its git repository size automatically by using a "shallow repository". This makes developing difficult by not providing branches and omitting the commit history.
+Cathook reduces its git repository size automatically by using a "shallow repository". This makes developing difficult
+by not providing branches and omitting the commit history.
 
 The easiest way to undo this is by running the `developer` script located in `scripts`.
 
 ### Pull requests and Branches
 
-In order to send code back to the official cathook repository, you must first create a copy of cathook on your github account ([fork](https://help.github.com/articles/creating-a-pull-request-from-a-fork/)) and then [create a pull request](https://help.github.com/articles/creating-a-pull-request-from-a-fork/) back to cathook.
+In order to send code back to the official cathook repository, you must first create a copy of cathook on your github
+account ([fork](https://help.github.com/articles/creating-a-pull-request-from-a-fork/)) and
+then [create a pull request](https://help.github.com/articles/creating-a-pull-request-from-a-fork/) back to cathook.
 
-Cathook developement is performed on multiple branches. Changes are then pull requested into master. By default, changes merged into master will not roll out to stable build users unless the `stable` tag is updated.
+Cathook developement is performed on multiple branches. Changes are then pull requested into master. By default, changes
+merged into master will not roll out to stable build users unless the `stable` tag is updated.
 
 ### Code-Style
 
 The nullworks code-style can be found in `code-style.md`.
 
 ### Building
 
-Cathook has already created the directory `build` where cmake files are located. By default, you can build cathook by running `cmake .. && make -j$(grep -c '^processor' /proc/cpuinfo)` in the `build` directory. You can then test your changes by using one of the attach scripts at your disposal.
+Cathook has already created the directory `build` where cmake files are located. By default, you can build cathook by
+running `cmake .. && make -j$(grep -c '^processor' /proc/cpuinfo)` in the `build` directory. You can then test your
+changes by using one of the attach scripts at your disposal.

README.md

@@ -1,4 +1,5 @@
 # Cathook Training Software
+
 ![banner](http://i.imgur.com/w96wdtE.png)
 [![CircleCI](https://circleci.com/gh/nullworks/cathook.svg?style=svg)](https://circleci.com/gh/nullworks/cathook)
 
@@ -10,7 +11,6 @@ The software could be detected by VAC in the future. Only use it on accounts you
 
 Cathook is a training software designed for Team Fortress 2 for Linux. Cathook includes some joke features like
 
-* Ignore Hoovy
 * Encrypted chat
 * Nullnexus Support (Find other Cathook users in-game automatically)
 * Sandvich aimbot
@@ -35,8 +35,11 @@ and a lot of useful features, including
 [View our short guide to installing and using cathook](https://cathook.club/wikis/Installing,-Attaching-And-General-Infos)
 
 ## Community
-You can chat with other cathook users in [our official Telegram group](https://t.me/nullworks) and the [cathook announcements channel](https://t.me/cathook_cheat).
-If you don't have Telegram, you can chat with other cathook users in our official Matrix room, however, you will have to ask TotallyNotElite or BenCat07 for an invite to said room.
+
+You can chat with other cathook users in [our official Telegram group](https://t.me/nullworks) and
+the [cathook announcements channel](https://t.me/cathook_cheat). If you don't have Telegram, you can chat with other
+cathook users in our official Matrix room, however, you will have to ask TotallyNotElite or BenCat07 for an invite to
+said room.
 
 ## Reporting Issues
 

Toolchain-cross-m32.cmake

@@ -1,51 +1,51 @@
-SET(CMAKE_C_FLAGS             "-m32" CACHE STRING "C compiler flags"   FORCE)
-SET(CMAKE_CXX_FLAGS           "-m32" CACHE STRING "C++ compiler flags" FORCE)
+SET(CMAKE_C_FLAGS "-m32" CACHE STRING "C compiler flags" FORCE)
+SET(CMAKE_CXX_FLAGS "-m32" CACHE STRING "C++ compiler flags" FORCE)
 
 SET(LIB32 /usr/lib) # Fedora
 
-IF(EXISTS /usr/lib32)
+IF (EXISTS /usr/lib32)
     SET(LIB32 /usr/lib32) # Arch, Solus
-ENDIF()
+ENDIF ()
 
 SET(CMAKE_SYSTEM_LIBRARY_PATH ${LIB32} CACHE STRING "system library search path" FORCE)
-SET(CMAKE_LIBRARY_PATH        ${LIB32} CACHE STRING "library search path"        FORCE)
+SET(CMAKE_LIBRARY_PATH ${LIB32} CACHE STRING "library search path" FORCE)
 
 # this is probably unlikely to be needed, but just in case
-SET(CMAKE_EXE_LINKER_FLAGS    "-m32 -L${LIB32}" CACHE STRING "executable linker flags"     FORCE)
+SET(CMAKE_EXE_LINKER_FLAGS "-m32 -L${LIB32}" CACHE STRING "executable linker flags" FORCE)
 SET(CMAKE_SHARED_LINKER_FLAGS "-m32 -L${LIB32}" CACHE STRING "shared library linker flags" FORCE)
-SET(CMAKE_MODULE_LINKER_FLAGS "-m32 -L${LIB32}" CACHE STRING "module linker flags"         FORCE)
+SET(CMAKE_MODULE_LINKER_FLAGS "-m32 -L${LIB32}" CACHE STRING "module linker flags" FORCE)
 
 # find Wx config script on Fedora for the highest version of 32 bit Wx installed
-IF(EXISTS ${LIB32}/wx/config)
+IF (EXISTS ${LIB32}/wx/config)
     FILE(GLOB WX_INSTALLS ${LIB32}/wx/config/*)
 
     SET(MAX_WX_VERSION 0.0)
-    FOREACH(WX_INSTALL ${WX_INSTALLS})
+    FOREACH (WX_INSTALL ${WX_INSTALLS})
         STRING(REGEX MATCH "[0-9]+(\\.[0-9]+)+" WX_VERSION ${WX_INSTALL})
 
-        IF(WX_VERSION VERSION_GREATER MAX_WX_VERSION)
+        IF (WX_VERSION VERSION_GREATER MAX_WX_VERSION)
             SET(MAX_WX_VERSION ${WX_VERSION})
-        ENDIF()
-    ENDFOREACH()
+        ENDIF ()
+    ENDFOREACH ()
 
     FILE(GLOB WX_INSTALL_CONFIGS "${LIB32}/wx/config/*${MAX_WX_VERSION}*")
     LIST(GET WX_INSTALL_CONFIGS 0 WX_INSTALL_CONFIG)
 
     SET(WX_CONFIG_TRANSFORM_SCRIPT_LINES
-        ""
-    )
+            ""
+            )
     FILE(WRITE ${CMAKE_BINARY_DIR}/wx-config-wrapper
-"#!/bin/sh
+            "#!/bin/sh
 ${WX_INSTALL_CONFIG} \"\$@\" | sed 's!/emul32/!/usr/!g'
 ")
     EXECUTE_PROCESS(COMMAND chmod +x ${CMAKE_BINARY_DIR}/wx-config-wrapper)
 
     SET(wxWidgets_CONFIG_EXECUTABLE ${CMAKE_BINARY_DIR}/wx-config-wrapper)
-ENDIF()
+ENDIF ()
 
 # on Fedora and Arch and similar, point pkgconfig at 32 bit .pc files. We have
 # to include the regular system .pc files as well (at the end), because some
 # are not always present in the 32 bit directory
-IF(EXISTS ${LIB32}/pkgconfig)
+IF (EXISTS ${LIB32}/pkgconfig)
     SET(ENV{PKG_CONFIG_LIBDIR} ${LIB32}/pkgconfig:/usr/share/pkgconfig:/usr/lib/pkgconfig:/usr/lib64/pkgconfig)
-ENDIF()
+ENDIF ()