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

2.4.2 & zone times proper

Browse Source
This commit is contained in:
Milxnor
2023-03-21 15:20:11 -04:00
parent 6d14b42a4f
commit 97ab80fef0
36 changed files with 1237 additions and 270 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
Project Reboot 3.0/FortInventory.cpp
View File

@@ -6,7 +6,7 @@ UFortItem* CreateItemInstance(AFortPlayerController* PlayerController, UFortItem
{
UFortItem* NewItemInstance = ItemDefinition->CreateTemporaryItemInstanceBP(Count);
if (NewItemInstance)
if (NewItemInstance && PlayerController)
NewItemInstance->SetOwningControllerForTemporaryItem(PlayerController);
return NewItemInstance;
@@ -96,23 +96,24 @@ std::pair<std::vector<UFortItem*>, std::vector<UFortItem*>> AFortInventory::AddI
Count = OverStack > 0 ? OverStack : Count;
auto PlayerController = Cast<AFortPlayerController>(GetOwner());
auto PlayerController = Cast<APlayerController>(GetOwner());
if (!PlayerController)
return std::make_pair(NewItemInstances, ModifiedItemInstances);
if (OverStack > 0 && !bAllowMultipleStacks)
{
auto Pawn = PlayerController->GetMyFortPawn();
auto Pawn = PlayerController->GetPawn();
if (!Pawn)
return std::make_pair(NewItemInstances, ModifiedItemInstances);
AFortPickup::SpawnPickup(ItemDefinition, Pawn->GetActorLocation(), Count, EFortPickupSourceTypeFlag::Player, EFortPickupSpawnSource::Unset, -1, Pawn);
AFortPickup::SpawnPickup(ItemDefinition, Pawn->GetActorLocation(), Count, EFortPickupSourceTypeFlag::Player, EFortPickupSpawnSource::Unset, -1, Cast<AFortPawn>(Pawn));
return std::make_pair(NewItemInstances, ModifiedItemInstances);
}
UFortItem* NewItemInstance = CreateItemInstance(PlayerController, ItemDefinition, Count);
auto FortPlayerController = Cast<AFortPlayerController>(PlayerController);
UFortItem* NewItemInstance = CreateItemInstance(FortPlayerController, ItemDefinition, Count);
if (NewItemInstance)
{
@@ -132,6 +133,36 @@ std::pair<std::vector<UFortItem*>, std::vector<UFortItem*>> AFortInventory::AddI
ItemInstances.Add(NewItemInstance);
GetItemList().GetReplicatedEntries().Add(*NewItemInstance->GetItemEntry(), FortItemEntrySize);
if (FortPlayerController && Engine_Version < 420)
{
static auto QuickBarsOffset = FortPlayerController->GetOffset("QuickBars", false);
auto QuickBars = FortPlayerController->Get<AActor*>(QuickBarsOffset);
enum class EFortQuickBars : uint8_t
{
Primary = 0,
Secondary = 1,
Max_None = 2,
EFortQuickBars_MAX = 3
};
struct
{
FGuid Item; // (Parm, IsPlainOldData)
EFortQuickBars InQuickBar; // (Parm, ZeroConstructor, IsPlainOldData)
int Slot; // (Parm, ZeroConstructor, IsPlainOldData)
}
AFortQuickBars_ServerAddItemInternal_Params
{
NewItemInstance->GetItemEntry()->GetItemGuid(),
IsPrimaryQuickbar(ItemDefinition) ? EFortQuickBars ::Primary : EFortQuickBars::Secondary,
-1
};
static auto ServerAddItemInternalFn = FindObject<UFunction>("/Script/FortniteGame.FortQuickBars.ServerAddItemInternal");
QuickBars->ProcessEvent(ServerAddItemInternalFn, &AFortQuickBars_ServerAddItemInternal_Params);
}
if (bShouldUpdate)
*bShouldUpdate = true;
}