diff --git a/Project Reboot 3.0/addresses.cpp b/Project Reboot 3.0/addresses.cpp index 83ade26..1120f55 100644 --- a/Project Reboot 3.0/addresses.cpp +++ b/Project Reboot 3.0/addresses.cpp @@ -628,6 +628,7 @@ std::vector Addresses::GetFunctionsToNull() std::vector BytesToFind = Fortnite_Version < 6.3 ? std::vector{ 0x40, 0x55 } : std::vector{ 0x48, 0x89, 0x5C }; toNull.push_back(Memcury::Scanner::FindStringRef(L"Widget Class %s - Running Initialize On Archetype, %s.").ScanFor(BytesToFind, false).Get()); // Widget class + toNull.push_back(Memcury::Scanner::FindPattern("48 89 5C 24 ? 48 89 74 24 ? 48 89 7C 24 ? 41 56 48 83 EC 30 41 0F B6 F0 48 8D 15 ? ? ? ? 48 8B F9 41 B8").Get()); // Update Rich Presence } if (Engine_Version >= 422 diff --git a/Project Reboot 3.0/dllmain.cpp b/Project Reboot 3.0/dllmain.cpp index a2e5f6b..ffacfc8 100644 --- a/Project Reboot 3.0/dllmain.cpp +++ b/Project Reboot 3.0/dllmain.cpp @@ -903,8 +903,11 @@ bool ReplicateActorHook(UActorChannel* Channel) return ReplicateActorOriginal(Channel); } +#define CLIENT_ONLY // only console reboot + DWORD WINAPI Main(LPVOID) { +#ifndef CLIENT_ONLY InitLogger(); std::cin.tie(0); @@ -924,6 +927,8 @@ DWORD WINAPI Main(LPVOID) LOG_INFO(LogInit, "Initializing Project Reboot!"); LOG_INFO(LogDev, "Built on {} {}", __DATE__, __TIME__); +#endif + Addresses::SetupVersion(); NumToSubtractFromSquadId = Engine_Version >= 424 ? 2 : Engine_Version >= 423 ? 3 : 0; // TODO: check this @@ -938,10 +943,6 @@ DWORD WINAPI Main(LPVOID) bEnableRebooting = Addresses::RebootingDelegate && Addresses::FinishResurrection && Addresses::GetSquadIdForCurrentPlayer && false; - LOG_INFO(LogDev, "Fortnite_CL: {}", Fortnite_CL); - LOG_INFO(LogDev, "Fortnite_Version: {}", Fortnite_Version); - LOG_INFO(LogDev, "Engine_Version: {}", Engine_Version); - #if 0 // CONSOLE ONLY (FOR CLIENT) SetConsoleTitleA("Console"); @@ -953,12 +954,14 @@ DWORD WINAPI Main(LPVOID) auto ViewportConsolePtr = GameViewport->GetPtr("ViewportConsole"); *ViewportConsolePtr = UGameplayStatics::SpawnObject(FindObject(L"/Script/Engine.Console"), GameViewport); - - LOG_INFO(LogDev, "Spawned Console! Exiting"); - +nPnn return 0; #endif + LOG_INFO(LogDev, "Fortnite_CL: {}", Fortnite_CL); + LOG_INFO(LogDev, "Fortnite_Version: {}", Fortnite_Version); + LOG_INFO(LogDev, "Engine_Version: {}", Engine_Version); + #ifdef ABOVE_S20 if (Fortnite_Version < 20) {