diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset index 0fe23856..5badf30e 100644 --- a/EndlessVendetta/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset +++ b/EndlessVendetta/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c3117b45f4b1be99dd1bd0cdd1cb1d167237a1105a9c1ce14bc1c6f15a095551 -size 58414 +oid sha256:06f7d267f6ba414ed498bc56b2186910a305a15dba88ea2d74a4601c84964150 +size 51069 diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/BP_PC.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/BP_PC.uasset index cf9c312e..efb68ec8 100644 --- a/EndlessVendetta/Content/FirstPerson/Blueprints/BP_PC.uasset +++ b/EndlessVendetta/Content/FirstPerson/Blueprints/BP_PC.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4d7d24aa46e86ffeb47791c341c30c4f33c5a475f33a822fc3aee599f0f6e481 -size 111954 +oid sha256:6989a8ccd556af587954b080e488056a6a2656b2f64ee3ba9e1d7008a1f7052d +size 112172 diff --git a/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.h b/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.h index 79a42a93..5538d8e4 100644 --- a/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.h +++ b/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.h @@ -8,7 +8,8 @@ #include "InputActionValue.h" #include "Components/ArrowComponent.h" #include "GadgetSystem/GadgetManager.h" - +#include "Inventory/InventoryComponent.h" + #include "EndlessVendettaCharacter.generated.h" class UWeaponInventory; diff --git a/EndlessVendetta/Source/EndlessVendetta/Inventory/InventoryComponent.cpp b/EndlessVendetta/Source/EndlessVendetta/Inventory/InventoryComponent.cpp index 1136b557..44eed2c0 100644 --- a/EndlessVendetta/Source/EndlessVendetta/Inventory/InventoryComponent.cpp +++ b/EndlessVendetta/Source/EndlessVendetta/Inventory/InventoryComponent.cpp @@ -178,6 +178,9 @@ void UInventoryComponent::RemoveItem(UBaseItem* Item) void UInventoryComponent::SpawnItem(UBaseItem* Item, FVector Location) { + if (!IsValid(Item)) return; + if (!IsValid(Item->ItemActor)) return; + GetWorld()->SpawnActor(Item->ItemActor, &Location); } void UInventoryComponent::UpdateInventorySize(const int _Columns, const int _Rows) diff --git a/EndlessVendetta/Source/EndlessVendetta/Inventory/InventoryComponent.h b/EndlessVendetta/Source/EndlessVendetta/Inventory/InventoryComponent.h index d60a9e45..e510717e 100644 --- a/EndlessVendetta/Source/EndlessVendetta/Inventory/InventoryComponent.h +++ b/EndlessVendetta/Source/EndlessVendetta/Inventory/InventoryComponent.h @@ -48,20 +48,20 @@ public: UFUNCTION(BlueprintCallable, Category="Inventory") void Pickup(); UFUNCTION(BlueprintCallable, Category="Inventory") - bool IsRoomAvailable(class UBaseItem* Item, const int TopLeftIndex); + bool IsRoomAvailable(UBaseItem* Item, const int TopLeftIndex); UFUNCTION(BlueprintCallable, Category="Inventory") FInventoryTile IndexToTile(const int Index) const; TTuple GetItemAtIndex(const int Index); UFUNCTION(BlueprintCallable, Category="Inventory") int TileToIndex(const FInventoryTile InventoryTile) const; UFUNCTION(BlueprintCallable, Category="Inventory") - void AddItemAt(class UBaseItem* Item, const int TopLeftIndex); + void AddItemAt(UBaseItem* Item, const int TopLeftIndex); UFUNCTION(BlueprintCallable, Category="Inventory") TMap GetAllItems(); UFUNCTION(BlueprintCallable, Category="Inventory") - void RemoveItem(class UBaseItem* Item); + void RemoveItem(UBaseItem* Item); UFUNCTION(BlueprintCallable, Category="Inventory") - void SpawnItem(class UBaseItem* Item, FVector Location); + void SpawnItem(UBaseItem* Item, FVector Location); UFUNCTION(BlueprintCallable, Category = "Inventory") void UpdateInventorySize(const int _Columns, const int _Rows);