Refactor project, inc build number

CMakeLists.txt

@@ -15,8 +15,8 @@ set(DIRECTX9_SDK_DIR $ENV{DIRECTX9_SDK_DIR})
 ################################################################################
 # Required projects
 ################################################################################
-add_subdirectory(src/vendor)
-add_subdirectory(src/tests)
+add_subdirectory(deps)
+add_subdirectory(tests)
 
 ################################################################################
 # Source groups
@@ -93,6 +93,7 @@ include_directories(
     "${PLUGIN_SDK_DIR}/shared"
     "${PLUGIN_SDK_DIR}/shared/game"
     "${DIRECTX9_SDK_DIR}/include"
+    "deps"
 )
 
 ################################################################################
@@ -178,17 +179,17 @@ d3dx9
 d3d11
 d3dx11
 XInput9_1_0
-Vendor
+Depend
 )
 
 target_link_directories(${PROJECT_NAME} PUBLIC
     "${PLUGIN_SDK_DIR}/output/lib/"
     "${DIRECTX9_SDK_DIR}/lib/x86/"
     "$<$<CONFIG:Release>:"
-        "vendor/Release/"
+        "deps/Release/"
     ">"
     "$<$<CONFIG:Debug>:"
-        "vendor/Debug/"
+        "deps/Debug/"
     ">"
 )
 

deps/CMakeLists.txt

@@ -1,11 +1,11 @@
 ################################################################################
-# Build Vendor.lib
+# Build Depend.lib
 # All the external libraries that shouldn't need to be compiled often
 ################################################################################
 cmake_minimum_required(VERSION 3.0)
-project(Vendor)
+project(Depend)
 
-set(vendor_files
+set(depend_files
     "fla/Main.h"
     "fla/Main.cpp"
     "fla/IDaccess.h"
@@ -41,7 +41,7 @@ set(vendor_files
     "kiero/minhook/trampoline.c"
 )
 
-add_library(${PROJECT_NAME} STATIC ${vendor_files})
+add_library(${PROJECT_NAME} STATIC ${depend_files})
 
 target_compile_definitions(${PROJECT_NAME} PRIVATE
     "$<$<CONFIG:Release>:"
@@ -105,7 +105,7 @@ set_target_properties(${PROJECT_NAME} PROPERTIES
 )
 
 target_link_directories(${PROJECT_NAME} PUBLIC
-    ${CMAKE_SOURCE_DIR}"/src/vendor/kiero/minhook/lib/"
+    ${CMAKE_SOURCE_DIR}"/deps/kiero/minhook/lib/"
 )
 
 target_link_libraries(${PROJECT_NAME} PUBLIC 

src/Hook.cpp

@@ -1,6 +1,6 @@
 #include "Hook.h"
-#include "vendor/kiero/kiero.h"
-#include "vendor/kiero/minhook/MinHook.h"
+#include "kiero/kiero.h"
+#include "kiero/minhook/MinHook.h"
 
 WNDPROC Hook::oWndProc = NULL;
 f_Present11 Hook::oPresent11 = NULL;
@@ -22,7 +22,7 @@ LRESULT Hook::WndProc(const HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 		Call<0x541BD0>(); // CPad::ClearMouseHistory
 
 		if (uMsg == WM_MOUSEWHEEL)
-			return 1;
+			CallWindowProc(oWndProc, hWnd, uMsg, 1.0, lParam);
 	}
 	else
 		patch::SetRaw(0x4EB9F4, (void*)"\xE8\x67\xFC\xFF\xFF", 5); // enable radio scroll

src/Json.h

@@ -1,5 +1,5 @@
 #pragma once
-#include "vendor\json.hpp"
+#include "json.hpp"
 
 class CJson
 {

src/MenuInfo.h

@@ -1,5 +1,5 @@
 #pragma once
 #define MENU_NAME "Cheat Menu"
 #define MENU_VERSION "2.6-beta"
-#define BUILD_NUMBER "20210204"
+#define BUILD_NUMBER "20210210"
 #define MENU_TITLE MENU_NAME " v" MENU_VERSION "(" BUILD_NUMBER ")"

src/Util.cpp

@@ -1,6 +1,6 @@
 #include "pch.h"
 #include "Util.h"
-#include "vendor/imgui/stb_image.h"
+#include "imgui/stb_image.h"
 
 void Util::ClearCharTasksVehCheck(CPed* ped)
 {

src/pch.h

@@ -51,12 +51,12 @@
 #include "eVehicleClass.h"
 #include "extensions/Paths.h"
 
-#include "vendor/fla/IDaccess.h"
-#include "vendor/imgui/imgui.h"
-#include "vendor/imgui/imgui_internal.h"
-#include "vendor/imgui/imgui_impl_dx9.h"
-#include "vendor/imgui/imgui_impl_dx11.h"
-#include "vendor/imgui/imgui_impl_win32.h"
+#include "fla/IDaccess.h"
+#include "imgui/imgui.h"
+#include "imgui/imgui_internal.h"
+#include "imgui/imgui_impl_dx9.h"
+#include "imgui/imgui_impl_dx11.h"
+#include "imgui/imgui_impl_win32.h"
 
 #include "Events.h"
 #include "Json.h"