Merge pull request #141 from MashdorDev/FeedbackRedirect

Feedback link within game, and pause menu.
MashdorDev · Feb 29, 2024 · 4ec205a · 4ec205a
2 parents 31ada33 + 5c466d9
commit 4ec205a
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 15 deletions.
diff --git a/Content/Unbread/Core/Character/BP_Character.uasset b/Content/Unbread/Core/Character/BP_Character.uasset
diff --git a/Content/Unbread/Core/GameModes/RespawnGamemode.uasset b/Content/Unbread/Core/GameModes/RespawnGamemode.uasset
diff --git a/Content/Unbread/Core/UI/Widgets/WBP_Main_Menu.uasset b/Content/Unbread/Core/UI/Widgets/WBP_Main_Menu.uasset
diff --git a/Content/Unbread/Core/UI/Widgets/WBP_PauseMenu.uasset b/Content/Unbread/Core/UI/Widgets/WBP_PauseMenu.uasset
diff --git a/Content/Unbread/Core/UI/Widgets/WBP_WinMenu.uasset b/Content/Unbread/Core/UI/Widgets/WBP_WinMenu.uasset
diff --git a/Source/unbread/Private/SRespawnGameMode.cpp b/Source/unbread/Private/SRespawnGameMode.cpp
@@ -16,12 +16,17 @@ void ASRespawnGameMode::BeginPlay()
 	CurLives = MaxLives;
 
 	SetSpawnLocation(FindPlayerStart(UGameplayStatics::GetPlayerController(GetWorld(), 0))->GetTransform());
-	UGameplayStatics::GetPlayerPawn(GetWorld(),0)->OnDestroyed.AddDynamic(this, &ASRespawnGameMode::RespawnPlayer);
 
-	// Temp code for testing pause game
-	/*FTimerHandle UnusedHandle;
-	GetWorldTimerManager().SetTimer(
-	UnusedHandle, this, &ASRespawnGameMode::PauseGame, 2.0f, false);*/
+	// get ref to player in world
+	APawn* Pawn = UGameplayStatics::GetPlayerPawn(GetWorld(),0);
+
+	// bind death and pause
+	Pawn->OnDestroyed.AddDynamic(this, &ASRespawnGameMode::RespawnPlayer);
+	if(auto Player = Cast<ASCharacter>(Pawn))
+	{
+		Player->PauseGame.AddDynamic(this, &ASRespawnGameMode::PauseGame);
+	}
+
 
 
 }
@@ -44,6 +49,7 @@ void ASRespawnGameMode::SpawnPlayer()
 		{
 			auto DynamicCamera = Cast<UDynamicCameraComponent>(Player->GetComponentByClass(UDynamicCameraComponent::StaticClass()));
 			DynamicCamera->FindDefaultLevelCamera();
+			Player->PauseGame.AddDynamic(this, &ASRespawnGameMode::PauseGame);
 		}
 
 	}

diff --git a/Source/unbread/Public/SCharacter.h b/Source/unbread/Public/SCharacter.h
@@ -24,6 +24,9 @@ class UGameplayEffect;
 class UAbilitySystemComponent;
 class ASWeapon;
 
+DECLARE_DYNAMIC_MULTICAST_DELEGATE(FGamePauseInput);
+
+
 UCLASS()
 class UNBREAD_API ASCharacter : public ACharacter, public IDynamicCameraInterface, public IAbilitySystemInterface, public IInteractInterface, public ICookieInterface
 {
@@ -208,6 +211,9 @@ class UNBREAD_API ASCharacter : public ACharacter, public IDynamicCameraInterfac
 
 	virtual void Landed(const FHitResult& Hit) override;
 
+	UPROPERTY(BlueprintAssignable, BlueprintCallable)
+	FGamePauseInput PauseGame;
+
 protected:
 	UPROPERTY()
 	TWeakObjectPtr<class UAbilitySystemComponent> AbilitySystemComponent;