Rafal/EndlessVendetta
Rafal/EndlessVendetta
1
0
Fork 0
Code Issues Pull Requests Releases 1 Activity

Bugfix TTuple Error Cannot be Macroed

Browse Source
This commit is contained in:
Philip W 2023-10-20 23:10:10 +01:00
parent 6609476eec
commit 36daaaed16
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
EndlessVendetta/Source/EndlessVendetta/Inventory/InventoryComponent.cpp
View File

@ -36,6 +36,7 @@ void UInventoryComponent::TickComponent(float DeltaTime, ELevelTick TickType, FA
bool UInventoryComponent::AddItem(UBaseItem* Item) bool UInventoryComponent::AddItem(UBaseItem* Item)
{ {
return false;
} }
void UInventoryComponent::LineTraceForItemCheck() void UInventoryComponent::LineTraceForItemCheck()
@ -76,8 +77,8 @@ FInventoryTile UInventoryComponent::IndexToTile(const int Index) const
TTuple<UBaseItem*, bool> UInventoryComponent::GetItemAtIndex(const int Index) TTuple<UBaseItem*, bool> UInventoryComponent::GetItemAtIndex(const int Index)
{ {
if (!InventoryItems.IsValidIndex(Index)) return std::make_tuple(nullptr, false); if (!InventoryItems.IsValidIndex(Index)) return MakeTuple(nullptr, false);
return std::make_tuple(InventoryItems[Index], true); return MakeTuple(InventoryItems[Index], true);
} }
int UInventoryComponent::TileToIndex(const FInventoryTile InventoryTile) const int UInventoryComponent::TileToIndex(const FInventoryTile InventoryTile) const

8
EndlessVendetta/Source/EndlessVendetta/Inventory/InventoryComponent.h
View File

@ -18,11 +18,11 @@ public:
// Sets default values for this component's properties // Sets default values for this component's properties
UInventoryComponent(); UInventoryComponent();
UPROPERTY(EditDefaultsOnly, BlueprintRead, Category="Inventory") UPROPERTY(EditDefaultsOnly, BlueprintReadOnly, Category="Inventory")
int Columns = 10; int Columns = 10;
UPROPERTY(EditDefaultsOnly, BlueprintRead, Category="Inventory") UPROPERTY(EditDefaultsOnly, BlueprintReadOnly, Category="Inventory")
int Rows = 10; int Rows = 10;
UPROPERTY(EditDefaultsOnly, BlueprintRead, Category="Inventory") UPROPERTY(EditDefaultsOnly, BlueprintReadOnly, Category="Inventory")
float MaxPickupDistance = 200.0f; float MaxPickupDistance = 200.0f;
protected: protected:
@ -43,7 +43,7 @@ public:
bool IsRoomAvailable(class UBaseItem* Item, const int TopLeftIndex); bool IsRoomAvailable(class UBaseItem* Item, const int TopLeftIndex);
UFUNCTION(BlueprintCallable, Category="Inventory") UFUNCTION(BlueprintCallable, Category="Inventory")
FInventoryTile IndexToTile(const int Index) const; FInventoryTile IndexToTile(const int Index) const;
UFUNCTION(BlueprintCallable, Category="Inventory") //UFUNCTION(BlueprintCallable, Category="Inventory")
TTuple<UBaseItem*, bool> GetItemAtIndex(const int Index); TTuple<UBaseItem*, bool> GetItemAtIndex(const int Index);
UFUNCTION(BlueprintCallable, Category="Inventory") UFUNCTION(BlueprintCallable, Category="Inventory")
int TileToIndex(const FInventoryTile InventoryTile) const; int TileToIndex(const FInventoryTile InventoryTile) const;