From b400954ab54d50d58533c76647beb7e1ba9a9a40 Mon Sep 17 00:00:00 2001 From: Milxnor Date: Sun, 23 Apr 2023 17:16:45 -0400 Subject: [PATCH] oops --- Project Reboot 3.0/FortPickup.cpp | 3 ++- Project Reboot 3.0/finder.h | 10 +++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/Project Reboot 3.0/FortPickup.cpp b/Project Reboot 3.0/FortPickup.cpp index 855a27e..755c9f6 100644 --- a/Project Reboot 3.0/FortPickup.cpp +++ b/Project Reboot 3.0/FortPickup.cpp @@ -40,7 +40,8 @@ AFortPickup* AFortPickup::SpawnPickup(FFortItemEntry* ItemEntry, FVector Locatio if (Addresses::PickupInitialize) { static void (*SetupPickup)(AFortPickup * Pickup, __int64 ItemEntry, TArray<__int64> MultiItemPickupEntriesIGuess, bool bSplitOnPickup) - = decltype(SetupPickup)(Addresses::PickupInitialize); // Memcury::Scanner::FindPattern("48 89 5C 24 ? 48 89 6C 24 ? 48 89 74 24 ? 41 56 48 83 EC 20 80 B9 ? ? ? ? ? 45 0F B6 F1 49 8B E8").Get()); + = decltype(SetupPickup)(Addresses::PickupInitialize); + TArray<__int64> MultiItemPickupEntriesIGuess{}; SetupPickup(Pickup, __int64(ItemEntry), MultiItemPickupEntriesIGuess, false); } diff --git a/Project Reboot 3.0/finder.h b/Project Reboot 3.0/finder.h index d5f9a4f..57ff5fc 100644 --- a/Project Reboot 3.0/finder.h +++ b/Project Reboot 3.0/finder.h @@ -144,10 +144,14 @@ static inline uint64 FindObjectArray() static inline uint64 FindPickupInitialize() { + if (Engine_Version == 420) + return Memcury::Scanner::FindPattern("48 89 5C 24 ? 48 89 6C 24 ? 48 89 74 24 ? 41 56 48 83 EC 20 80 B9 ? ? ? ? ? 45 0F B6 F1 49 8B E8").Get(); // 4.1 + if (Engine_Version == 421) + return Memcury::Scanner::FindPattern("48 89 5C 24 ? 55 57 41 57 48 83 EC 30 80 B9 ? ? ? ? ? 41 0F B6").Get(); // 6.21 + if (Engine_Version == 422) + return Memcury::Scanner::FindPattern("48 89 5C 24 ? 57 41 56 41 57 48 83 EC 30 80 B9 ? ? ? ? ? 45 0F B6 F1").Get(); // 7.30 if (Engine_Version == 423) - { - return Memcury::Scanner::FindPattern("48 89 5C 24 ? 57 41 56 41 57 48 83 EC 30 80 B9 ? ? ? ? ? 45 0F B6 F1 4D").Get(); - } + return Memcury::Scanner::FindPattern("48 89 5C 24 ? 57 41 56 41 57 48 83 EC 30 80 B9 ? ? ? ? ? 45 0F B6 F1 4D").Get(); // 8.51 & 10.40 return 0; }