diff --git a/EndlessVendetta/Content/BountySystem/Waypoint/WBP_WaypointWidget.uasset b/EndlessVendetta/Content/BountySystem/Waypoint/WBP_WaypointWidget.uasset index 09b70476..09966a1a 100644 --- a/EndlessVendetta/Content/BountySystem/Waypoint/WBP_WaypointWidget.uasset +++ b/EndlessVendetta/Content/BountySystem/Waypoint/WBP_WaypointWidget.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3b07b293876d399dfdce186c99573c335e2e2e509856f7a67a2a463569b4f23d -size 30404 +oid sha256:b58d0ca6a59826731ad87a5a7fc10d3006d44eab8ccba7ef819e065a8c6da9c1 +size 30968 diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset index 8e4ecbd1..5fb874ed 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:722ad362b974f8cd884e1852c963e27f75f4ed6f285759adbd3c3571b1f477c0 -size 57740 +oid sha256:87aebe0b0ade2372a24d8570aa5634a1d111bfee7a657fb15631ce0569065b4f +size 60696 diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/WBP_CheckpointCompleted.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/WBP_CheckpointCompleted.uasset index 3ef7c033..ece0d8c4 100644 --- a/EndlessVendetta/Content/FirstPerson/Blueprints/WBP_CheckpointCompleted.uasset +++ b/EndlessVendetta/Content/FirstPerson/Blueprints/WBP_CheckpointCompleted.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:845fc89fb83a130aea8498c87ed41fadd3de14e00ac010bcd5843b5a19c29f8f -size 58154 +oid sha256:64fe64e549080d0ddf002d488c0e30412912c0088e529e0895ead72f976b2dad +size 79669 diff --git a/EndlessVendetta/Source/EndlessVendetta/BountySystem/BountyClass.cpp b/EndlessVendetta/Source/EndlessVendetta/BountySystem/BountyClass.cpp index 38d939c9..bfd9876e 100644 --- a/EndlessVendetta/Source/EndlessVendetta/BountySystem/BountyClass.cpp +++ b/EndlessVendetta/Source/EndlessVendetta/BountySystem/BountyClass.cpp @@ -70,6 +70,7 @@ void ABountyClass::IncrementBountyCheckpoint() BountyCheckpoints[0]->Destroy(); BountyCheckpoints.RemoveAt(0); UE_LOG(LogTemp, Warning, TEXT(" You've Completed the Bounty!! Well done")); + Cast(GetWorld()->GetFirstPlayerController()->GetPawn())->CheckpointCompletedUI(FString("")); return; } @@ -89,6 +90,8 @@ void ABountyClass::IncrementBountyCheckpoint() BountyCheckpoints[0]->SpawnWaypoint(); BountyCheckpoints[0]->CheckpointActivated(); BountyCheckpoints[0]->CompletedCheckpoint.AddDynamic(this, &ABountyClass::IncrementBountyCheckpoint); + + Cast(GetWorld()->GetFirstPlayerController()->GetPawn())->CheckpointCompletedUI(BountyCheckpoints[0]->GetCheckpointDesc()); } diff --git a/EndlessVendetta/Source/EndlessVendetta/BountySystem/CheckpointClass.h b/EndlessVendetta/Source/EndlessVendetta/BountySystem/CheckpointClass.h index 9c0fa9bf..2bc602b1 100644 --- a/EndlessVendetta/Source/EndlessVendetta/BountySystem/CheckpointClass.h +++ b/EndlessVendetta/Source/EndlessVendetta/BountySystem/CheckpointClass.h @@ -34,7 +34,6 @@ protected: UFUNCTION(BlueprintCallable, Category = "Checkpoint") void BroadcastCompletion() { - Cast(GetWorld()->GetFirstPlayerController()->GetPawn())->CheckpointCompletedUI(); CompletedCheckpoint.Broadcast(); } diff --git a/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.h b/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.h index 106416a8..5661588f 100644 --- a/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.h +++ b/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.h @@ -196,7 +196,7 @@ public: void WeaponSwitcher(AActor* Outhit); UFUNCTION(BlueprintImplementableEvent) - void CheckpointCompletedUI(); + void CheckpointCompletedUI(const FString& CheckpointDesc); // Returns true if successfully changed to a new gadget, can fail if the target gadget to replace is being used bool UpdateGadgetType(TSubclassOf NewGadgetClass);