yindo/Project-Reboot-3.0
1
0
Fork 0
mirror of https://github.com/Milxnor/Project-Reboot-3.0.git synced 2026-01-13 02:42:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix practically every version since i broke it last commit

Browse Source
This commit is contained in:
Milxnor
2023-03-24 07:32:58 -04:00
parent 7d21fef63a
commit 907650ef85
12 changed files with 37 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Project Reboot 3.0/AthenaMarkerComponent.cpp
View File

@@ -33,9 +33,9 @@ void UAthenaMarkerComponent::ServerAddMapMarkerHook(UAthenaMarkerComponent* Mark
MarkerData->GetMarkerType() = MarkerRequestPtr->GetMarkerType();
MarkerData->GetOwner() = PlayerState;
MarkerData->GetWorldNormal() = MarkerRequestPtr->GetWorldNormal();
if (WorldPositionOffset != 0)
if (WorldPositionOffset != -1)
MarkerData->GetWorldPosition() = MarkerRequestPtr->GetWorldPosition();
if (WorldPositionOffset != 0)
if (WorldPositionOffset != -1)
MarkerData->GetWorldPositionOffset() = MarkerRequestPtr->GetWorldPositionOffset();
MarkerData->GetMarkerID() = MarkerID;
MarkerData->GetMarkedActorClass().SoftObjectPtr.WeakPtr.ObjectIndex = -1;

2
Project Reboot 3.0/BuildingActor.h
View File

@@ -41,7 +41,7 @@ public:
static auto TeamIndexOffset = GetOffset("TeamIndex", false);
if (TeamIndexOffset != 0)
if (TeamIndexOffset != -1)
Get<uint8_t>(TeamIndexOffset) = InTeam;
}
else

2
Project Reboot 3.0/FortAthenaCreativePortal.h
View File

@@ -30,7 +30,7 @@ public:
{
static auto OwningPlayerOffset = GetOffset("OwningPlayer", false);
if (OwningPlayerOffset == 0)
if (OwningPlayerOffset == -1)
return nullptr;
return GetPtr<void>(OwningPlayerOffset);

26
Project Reboot 3.0/FortGameModeAthena.cpp
View File

@@ -56,7 +56,7 @@ void ShowFoundation(UObject* BuildingFoundation)
static auto bShowHLODWhenDisabledOffset = BuildingFoundation->GetOffset("bShowHLODWhenDisabled", false);
if (bShowHLODWhenDisabledOffset != 0)
if (bShowHLODWhenDisabledOffset != -1)
{
static auto bShowHLODWhenDisabledFieldMask = GetFieldMask(BuildingFoundation->GetProperty("bShowHLODWhenDisabled"));
BuildingFoundation->SetBitfieldValue(bShowHLODWhenDisabledOffset, bShowHLODWhenDisabledFieldMask, true);
@@ -67,7 +67,7 @@ void ShowFoundation(UObject* BuildingFoundation)
static auto DynamicFoundationRepDataOffset = BuildingFoundation->GetOffset("DynamicFoundationRepData", false);
if (DynamicFoundationRepDataOffset != 0)
if (DynamicFoundationRepDataOffset != -1)
{
auto DynamicFoundationRepData = BuildingFoundation->GetPtr<void>(DynamicFoundationRepDataOffset);
@@ -81,7 +81,7 @@ void ShowFoundation(UObject* BuildingFoundation)
static auto FoundationEnabledStateOffset = BuildingFoundation->GetOffset("FoundationEnabledState", false);
if (FoundationEnabledStateOffset != 0)
if (FoundationEnabledStateOffset != -1)
BuildingFoundation->Get<EDynamicFoundationEnabledState>(FoundationEnabledStateOffset) = EDynamicFoundationEnabledState::Enabled;
}
@@ -123,7 +123,7 @@ FName AFortGameModeAthena::RedirectLootTier(const FName& LootTier)
{
static auto RedirectAthenaLootTierGroupsOffset = this->GetOffset("RedirectAthenaLootTierGroups", false);
if (RedirectAthenaLootTierGroupsOffset == 0)
if (RedirectAthenaLootTierGroupsOffset == -1)
{
static auto Loot_TreasureFName = UKismetStringLibrary::Conv_StringToName(L"Loot_Treasure");
static auto Loot_AmmoFName = UKismetStringLibrary::Conv_StringToName(L"Loot_Ammo");
@@ -276,7 +276,7 @@ bool AFortGameModeAthena::Athena_ReadyToStartMatchHook(AFortGameModeAthena* Game
{
static auto UpdateMapOffset = Scripting->GetOffset("UpdateMap", false);
if (UpdateMapOffset != 0)
if (UpdateMapOffset != -1)
{
Scripting->Get<bool>(UpdateMapOffset) = true;
@@ -386,7 +386,7 @@ bool AFortGameModeAthena::Athena_ReadyToStartMatchHook(AFortGameModeAthena* Game
{
static auto AdditionalLevelsOffset = PlaylistToUse->GetOffset("AdditionalLevels", false);
if (AdditionalLevelsOffset != 0)
if (AdditionalLevelsOffset != -1)
{
auto& AdditionalLevels = PlaylistToUse->Get<TArray<TSoftObjectPtr<UClass>>>(AdditionalLevelsOffset);
@@ -710,7 +710,7 @@ void AFortGameModeAthena::Athena_HandleStartingNewPlayerHook(AFortGameModeAthena
static auto CharacterPartsOffset = PlayerStateAthena->GetOffset("CharacterParts", false);
static auto CustomCharacterPartsStruct = FindObject<UStruct>("/Script/FortniteGame.CustomCharacterParts");
if (CharacterPartsOffset != 0) // && CustomCharacterPartsStruct)
if (CharacterPartsOffset != -1) // && CustomCharacterPartsStruct)
{
auto CharacterParts = PlayerStateAthena->GetPtr<__int64>("CharacterParts");
@@ -732,7 +732,7 @@ void AFortGameModeAthena::Athena_HandleStartingNewPlayerHook(AFortGameModeAthena
static auto SquadIdOffset = PlayerStateAthena->GetOffset("SquadId", false);
if (SquadIdOffset != 0)
if (SquadIdOffset != -1)
PlayerStateAthena->GetSquadId() = PlayerStateAthena->GetTeamIndex() - 2;
// idk if this is needed
@@ -807,7 +807,7 @@ void AFortGameModeAthena::Athena_HandleStartingNewPlayerHook(AFortGameModeAthena
static auto GameMemberInfoArrayOffset = GameState->GetOffset("GameMemberInfoArray", false);
// if (false)
// if (GameMemberInfoArrayOffset != 0)
// if (GameMemberInfoArrayOffset != -1)
if (Engine_Version >= 423)
{
struct FGameMemberInfo : public FFastArraySerializerItem
@@ -867,7 +867,7 @@ void AFortGameModeAthena::Athena_HandleStartingNewPlayerHook(AFortGameModeAthena
AFortAthenaCreativePortal* Portal = nullptr;
if (AvailablePortalsOffset != 0)
if (AvailablePortalsOffset != -1)
{
auto& AvailablePortals = CreativePortalManager->Get<TArray<AActor*>>(AvailablePortalsOffset);
@@ -918,7 +918,7 @@ void AFortGameModeAthena::Athena_HandleStartingNewPlayerHook(AFortGameModeAthena
static auto PlayersReadyOffset = Portal->GetOffset("PlayersReady", false);
if (PlayersReadyOffset != 0)
if (PlayersReadyOffset != -1)
{
auto& PlayersReady = Portal->Get<TArray<FUniqueNetIdRepl>>(PlayersReadyOffset);
PlayersReady.AddPtr(PlayerStateUniqueId, FUniqueNetIdRepl::GetSizeOfStruct()); // im not even sure what this is for
@@ -926,7 +926,7 @@ void AFortGameModeAthena::Athena_HandleStartingNewPlayerHook(AFortGameModeAthena
static auto bUserInitiatedLoadOffset = Portal->GetOffset("bUserInitiatedLoad", false);
if (bUserInitiatedLoadOffset != 0)
if (bUserInitiatedLoadOffset != -1)
Portal->GetUserInitiatedLoad() = true;
Portal->GetInErrorState() = false;
@@ -976,7 +976,7 @@ void AFortGameModeAthena::Athena_HandleStartingNewPlayerHook(AFortGameModeAthena
{
static auto QuickBarsOffset = NewPlayer->GetOffset("QuickBars", false);
if (QuickBarsOffset != 0)
if (QuickBarsOffset != -1)
{
static auto FortQuickBarsClass = FindObject<UClass>("/Script/FortniteGame.FortQuickBars");
NewPlayer->Get<AActor*>(QuickBarsOffset) = GetWorld()->SpawnActor<AActor>(FortQuickBarsClass);

2
Project Reboot 3.0/FortGameStateAthena.cpp
View File

@@ -12,7 +12,7 @@ UObject*& AFortGameStateAthena::GetCurrentPlaylist()
{
static auto CurrentPlaylistInfoOffset = GetOffset("CurrentPlaylistInfo", false);
if (CurrentPlaylistInfoOffset == 0)
if (CurrentPlaylistInfoOffset == -1)
{
static auto CurrentPlaylistDataOffset = GetOffset("CurrentPlaylistData");
return Get(CurrentPlaylistDataOffset);

8
Project Reboot 3.0/FortKismetLibrary.cpp
View File

@@ -39,7 +39,7 @@ void UFortKismetLibrary::ApplyCharacterCosmetics(UObject* WorldContextObject, co
static auto CharacterPartsOffset = PlayerState->GetOffset("CharacterParts", false);
if (CharacterPartsOffset != 0)
if (CharacterPartsOffset != -1)
{
auto CharacterPartsPS = PlayerState->GetPtr<__int64>("CharacterParts");
@@ -123,10 +123,10 @@ void UFortKismetLibrary::GiveItemToInventoryOwnerHook(UObject* Context, FFrame&
LOG_INFO(LogDev, __FUNCTION__);
if (ItemLevelOffset != 0)
if (ItemLevelOffset != -1)
Stack.StepCompiledIn(&ItemLevel);
if (PickupInstigatorHandleOffset != 0)
if (PickupInstigatorHandleOffset != -1)
Stack.StepCompiledIn(&PickupInstigatorHandle);
if (!ItemDefinition)
@@ -395,7 +395,7 @@ bool UFortKismetLibrary::PickLootDropsHook(UObject* Context, FFrame& Stack, bool
int WorldLevel; // (ConstParm, Parm, ZeroConstructor, IsPlainOldData, NoDestructor, HasGetValueTypeHash, NativeAccessSpecifierPublic)
int ForcedLootTier; // (ConstParm, Parm, ZeroConstructor, IsPlainOldData, NoDestructor, HasGetValueTypeHash, NativeAccessSpecifierPublic)
if (WorldContextObjectOffset != 0)
if (WorldContextObjectOffset != -1)
Stack.StepCompiledIn(&WorldContextObject);
auto& OutLootToDrop = Stack.StepCompiledInRef<TArray<FFortItemEntry>>(&OutLootToDropTempBuf);

4
Project Reboot 3.0/FortPlayerController.h
View File

@@ -49,10 +49,10 @@ public:
{
static auto CosmeticLoadoutPCOffset = this->GetOffset("CosmeticLoadoutPC", false);
if (CosmeticLoadoutPCOffset == 0)
if (CosmeticLoadoutPCOffset == -1)
CosmeticLoadoutPCOffset = this->GetOffset("CustomizationLoadout");
if (CosmeticLoadoutPCOffset == 0)
if (CosmeticLoadoutPCOffset == -1)
return nullptr;
auto CosmeticLoadout = this->GetPtr<FFortAthenaLoadout>(CosmeticLoadoutPCOffset);

2
Project Reboot 3.0/NetDriver.cpp
View File

@@ -9,7 +9,7 @@ void UNetDriver::TickFlushHook(UNetDriver* NetDriver)
{
static auto ReplicationDriverOffset = NetDriver->GetOffset("ReplicationDriver", false);
if (ReplicationDriverOffset == 0)
if (ReplicationDriverOffset == -1)
{
NetDriver->ServerReplicateActors();
}

4
Project Reboot 3.0/Object.cpp
View File

@@ -52,7 +52,7 @@ void* UObject::GetProperty(const std::string& ChildName, bool bWarnIfNotFound)
if (bWarnIfNotFound)
LOG_WARN(LogFinder, "Unable to find0{}", ChildName);
return 0;
return nullptr;
}
int UObject::GetOffset(const std::string& ChildName, bool bWarnIfNotFound)
@@ -60,7 +60,7 @@ int UObject::GetOffset(const std::string& ChildName, bool bWarnIfNotFound)
auto Property = GetProperty(ChildName, bWarnIfNotFound);
if (!Property)
return 0;
return -1;
return *(int*)(__int64(Property) + Offsets::Offset_Internal);
}

2
Project Reboot 3.0/PlayerState.cpp
View File

@@ -6,7 +6,7 @@ int& APlayerState::GetPlayerID()
{
static auto PlayerIDOffset = FindOffsetStruct("/Script/Engine.PlayerState", "PlayerID", false);
if (PlayerIDOffset == 0)
if (PlayerIDOffset == -1)
{
static auto PlayerIdOffset = FindOffsetStruct("/Script/Engine.PlayerState", "PlayerId", false);
return Get<int>(PlayerIdOffset);

11
Project Reboot 3.0/reboot.h
View File

@@ -270,7 +270,7 @@ inline int FindOffsetStruct(const std::string& StructName, const std::string& Me
if (bWarnIfNotFound)
LOG_WARN(LogFinder, "Unable to find1 {}", MemberName);
return 0;
return -1;
}
static void CopyStruct(void* Dest, void* Src, size_t Size)
@@ -319,9 +319,7 @@ static UObject* GetPlaylistToUse()
auto Playlist = FindObject("/Game/Athena/Playlists/Playlist_DefaultSolo.Playlist_DefaultSolo");
// Playlist = FindObject("/BlueCheese/Playlists/Playlist_ShowdownAlt_BlueCheese_Trios.Playlist_ShowdownAlt_BlueCheese_Trios");
/*
if (Globals::bGoingToPlayEvent)
/* if (Globals::bGoingToPlayEvent)
{
if (Fortnite_Version != 12.61)
{
@@ -337,8 +335,9 @@ static UObject* GetPlaylistToUse()
Playlist = EventPlaylist;
}
}
}
*/
} */
// SET OVERRIDE PLAYLIST DOWN HERE
// Playlist = FindObject("/Game/Athena/Playlists/Playground/Playlist_Playground.Playlist_Playground");

8
Project Reboot 3.0/vehicles.h
View File

@@ -129,7 +129,7 @@ static inline AActor* SpawnVehicleFromSpawner(AActor* VehicleSpawner)
static auto VehicleClassOffset = VehicleSpawner->GetOffset("VehicleClass", false);
if (VehicleClassOffset != 0) // 10.40 and below?
if (VehicleClassOffset != -1) // 10.40 and below?
{
auto& SoftVehicleClass = VehicleSpawner->Get<TSoftObjectPtr<UClass>>(VehicleClassOffset);
auto StrongVehicleClass = SoftVehicleClass.Get();
@@ -146,7 +146,7 @@ static inline AActor* SpawnVehicleFromSpawner(AActor* VehicleSpawner)
static auto FortVehicleItemDefOffset = VehicleSpawner->GetOffset("FortVehicleItemDef");
if (FortVehicleItemDefOffset == 0)
if (FortVehicleItemDefOffset == -1)
return nullptr;
auto& SoftFortVehicleItemDef = VehicleSpawner->Get<TSoftObjectPtr<UFortItemDefinition>>(FortVehicleItemDefOffset);
@@ -202,7 +202,7 @@ static inline void SpawnVehicles()
static auto VIDClass = FindObject<UClass>("/Script/FortniteGame.FortVehicleItemDefinition");
if (FortVehicleItemDefVariantsOffset != 0)
if (FortVehicleItemDefVariantsOffset != -1)
{
struct FVehicleWeightedDef
{
@@ -250,7 +250,7 @@ static inline void SpawnVehicles()
{
static auto FortVehicleItemDefOffset = VehicleSpawner->GetOffset("FortVehicleItemDef");
if (FortVehicleItemDefOffset == 0)
if (FortVehicleItemDefOffset == -1)
{
}