diff --git a/Content/Blueprints/GI_NakedDesire.uasset b/Content/Blueprints/GI_NakedDesire.uasset index b2457d33..c71c2426 100644 --- a/Content/Blueprints/GI_NakedDesire.uasset +++ b/Content/Blueprints/GI_NakedDesire.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3391733042d4ed5bcce041c9478295a19ff7d003edf6ec6f4dcb9c683f37bf0f +oid sha256:b45399cab4cd893a2c237801bba3ed505d89eafdb22164c633c7a91d8e3a4d35 size 34867 diff --git a/Content/Blueprints/Player/BP_Player.uasset b/Content/Blueprints/Player/BP_Player.uasset index 9588fc1e..f6291eb1 100644 --- a/Content/Blueprints/Player/BP_Player.uasset +++ b/Content/Blueprints/Player/BP_Player.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:60cfe543bba3c777c37c931de28a596db1c05814a4f93ad60f9b45a11311a1ba -size 67456 +oid sha256:6732be5467c8147ce87258f6ea243cd3c634c4ac5f0877e2dc2728e89f9f5dae +size 88872 diff --git a/Source/NakedDesire/SaveGame/SaveSubsystem.cpp b/Source/NakedDesire/SaveGame/SaveSubsystem.cpp index fbbb3faf..e334d2b0 100644 --- a/Source/NakedDesire/SaveGame/SaveSubsystem.cpp +++ b/Source/NakedDesire/SaveGame/SaveSubsystem.cpp @@ -20,19 +20,6 @@ bool USaveSubsystem::SaveGame(const FString& SlotName) const return UGlobalSaveGameData::SaveGame(CurrentSave, SlotName); } -void USaveSubsystem::AddItem(const FItemSaveRecord& Record) -{ - Items.Add(Record); -} - -void USaveSubsystem::RemoveItem(const FGuid& InstanceId) -{ - Items.RemoveAll([InstanceId](const FItemSaveRecord& Item) - { - return Item.InstanceId == InstanceId; - }); -} - void USaveSubsystem::Initialize(FSubsystemCollectionBase& Collection) { Super::Initialize(Collection); @@ -56,6 +43,16 @@ UGlobalSaveGameData* USaveSubsystem::GetCurrentSave() return CurrentSave; } +void USaveSubsystem::BP_LoadGame() +{ + LoadGame(); +} + +void USaveSubsystem::BP_SaveGame() +{ + SaveGame(); +} + void USaveSubsystem::PopulateStartingData(UGlobalSaveGameData* Save) const { if (!Save) @@ -77,4 +74,4 @@ void USaveSubsystem::PopulateStartingData(UGlobalSaveGameData* Save) const Record.Init(Instance); Save->EquippedItems.Add(Record); } -} \ No newline at end of file +} diff --git a/Source/NakedDesire/SaveGame/SaveSubsystem.h b/Source/NakedDesire/SaveGame/SaveSubsystem.h index 3af308e3..1da26ff9 100644 --- a/Source/NakedDesire/SaveGame/SaveSubsystem.h +++ b/Source/NakedDesire/SaveGame/SaveSubsystem.h @@ -19,13 +19,16 @@ public: void LoadGame(const FString& SlotName = DefaultSaveSlotName); bool SaveGame(const FString& SlotName = DefaultSaveSlotName) const; - const TArray& GetItems() const { return Items; } - void AddItem(const FItemSaveRecord& Record); - void RemoveItem(const FGuid& InstanceId); - virtual void Initialize(FSubsystemCollectionBase& Collection) override; UGlobalSaveGameData* GetCurrentSave(); + +protected: + UFUNCTION(BlueprintCallable) + void BP_LoadGame(); + + UFUNCTION(BlueprintCallable) + void BP_SaveGame(); private: void PopulateStartingData(UGlobalSaveGameData* Save) const; @@ -33,9 +36,6 @@ private: UPROPERTY() FString ActiveSlotName = DefaultSaveSlotName; - UPROPERTY() - TArray Items; - UPROPERTY() TObjectPtr CurrentSave; }; \ No newline at end of file