submodule update

ThirteenAG · Mar 6, 2024 · 74150b7 · 74150b7
1 parent 99ed894
commit 74150b7
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -10,3 +10,6 @@
 [submodule "external/FusionDxHook"]
 	path = external/FusionDxHook
 	url = https://github.com/ThirteenAG/FusionDxHook
+[submodule "external/injector"]
+	path = external/injector
+	url = https://github.com/ThirteenAG/injector
diff --git a/external/FusionDxHook b/external/FusionDxHook
diff --git a/premake5.lua b/premake5.lua
@@ -22,12 +22,13 @@ workspace "XboxRainDroplets"
    files { "source/resources/Versioninfo.rc" }
    files { "source/resources/Dropmask.rc" }
    files { "external/hooking/Hooking.Patterns.h", "external/hooking/Hooking.Patterns.cpp" }
+   files { "external/injector/safetyhook/safetyhook.hpp", "external/injector/safetyhook/safetyhook.cpp" }
+   files { "external/injector/safetyhook/Zydis.h", "external/injector/safetyhook/Zydis.c" }
    includedirs { "external/hooking" }
    includedirs { "external/injector/include" }
+   includedirs { "external/injector/safetyhook" }
    includedirs { "external/FusionDxHook/includes" }
-   includedirs { "external/FusionDxHook/includes/safetyhook" }
    includedirs { "external/sire" }
-   files { "external/FusionDxHook/includes/safetyhook/*.*" }
    files { "external/sire/sire.h" }
    local dxsdk = os.getenv "DXSDK_DIR"
    if dxsdk then
@@ -139,17 +140,18 @@ workspace "XboxRainDropletsWrapper"
    files { "source/resources/Versioninfo.rc" }
    files { "source/resources/Dropmask.rc" }
    files { "external/hooking/Hooking.Patterns.h", "external/hooking/Hooking.Patterns.cpp" }
+   files { "external/injector/safetyhook/safetyhook.hpp", "external/injector/safetyhook/safetyhook.cpp" }
+   files { "external/injector/safetyhook/Zydis.h", "external/injector/safetyhook/Zydis.c" }
    includedirs { "source" }
    includedirs { "external" }
    includedirs { "external/hooking" }
    includedirs { "external/injector/include" }
+   includedirs { "external/injector/safetyhook" }
    includedirs { "external/FusionDxHook/includes" }
-   includedirs { "external/FusionDxHook/includes/safetyhook" }
    includedirs { "external/sire" }
    includedirs { "source/dxsdk/dx8" }
    libdirs { "source/dxsdk/dx8" }
 
-   files { "external/FusionDxHook/includes/safetyhook/*.*" }
    files { "external/sire/sire.h" }
 
 

diff --git a/source/MaxPayne3.XboxRainDroplets.cpp b/source/MaxPayne3.XboxRainDroplets.cpp
@@ -2,9 +2,7 @@
 #include <injector\hooking.hpp>
 #include <injector\calling.hpp>
 #include <injector\utility.hpp>
-#ifdef _M_IX86
 #include <injector\assembly.hpp>
-#endif
 
 #include "xrd11.h"
 #define FUSIONDXHOOK_INCLUDE_D3D9     1
@@ -15,7 +13,6 @@
 #define DELAYED_BIND 2000ms
 #include "FusionDxHook.h"
 
-
 //static auto ppDevice = *hook::get_pattern<uint32_t>("68 ? ? ? ? 68 ? ? ? ? 8B D7 83 CA 10", 1);
 uint32_t jmpaddr;
 void __declspec(naked) sub_12D4470()

diff --git a/source/xrd.h b/source/xrd.h
@@ -33,9 +33,7 @@ typedef IDirect3DIndexBuffer9 IDirect3DIndexBuffer;
 #include <injector\hooking.hpp>
 #include <injector\calling.hpp>
 #include <injector\utility.hpp>
-#ifdef _M_IX86
 #include <injector\assembly.hpp>
-#endif
 #include <filesystem>
 #include <algorithm>
 #include <thread>