Make HUD and In-Game menu work in multiplayer, moved In-Game Menu to separated widget

Author: JanSeliv

Content/Bomber/EnhancedInput/InputActions/IA_UI_Menu.uasset

@@ -15,7 +15,7 @@
 #include "Globals/MyInputAction.h"
 #include "Globals/SingletonLibrary.h"
 #include "LevelActors/PlayerCharacter.h"
-#include "UI/InGameWidget.h"
+#include "UI/InGameMenuWidget.h"
 #include "UI/MainMenuWidget.h"
 #include "UI/MyHUD.h"
 #include "UI/SettingsWidget.h"
@@ -303,7 +303,6 @@ void AMyPlayerController::OnPossess(APawn* InPawn)
 
 	SetControlRotation(FRotator::ZeroRotator);
 
-	BroadcastOnPossessed();
 	BroadcastOnSetPlayerState();
 
 	BindInputActions();
@@ -314,7 +313,8 @@ void AMyPlayerController::OnRep_Pawn()
 {
 	Super::OnRep_Pawn();
 
-	BroadcastOnPossessed();
+	// Notify client about pawn change
+	GetOnNewPawnNotifier().Broadcast(GetPawn());
 
 	BindInputActions();
 }
@@ -556,10 +556,10 @@ void AMyPlayerController::OnWidgetsInitialized()
 	}
 
 	// Listens to handle input on opening and closing the InGame Menu widget
-	UInGameWidget* InGameWidget = USingletonLibrary::GetInGameWidget();
-	if (ensureMsgf(InGameWidget, TEXT("ASSERT: 'InGameWidget' is not valid")))
+	UInGameMenuWidget* InGameMenuWidget = USingletonLibrary::GetInGameMenuWidget();
+	if (ensureMsgf(InGameMenuWidget, TEXT("ASSERT: 'InGameMenuWidget' is not valid")))
 	{
-		InGameWidget->OnToggledInGameMenu.AddUniqueDynamic(this, &ThisClass::OnToggledInGameMenu);
+		InGameMenuWidget->OnToggledInGameMenu.AddUniqueDynamic(this, &ThisClass::OnToggledInGameMenu);
 	}
 
 	// Listens to handle input on opening and closing the Settings widget
@@ -570,23 +570,6 @@ void AMyPlayerController::OnWidgetsInitialized()
 	}
 }
 
-// Is called on server and on client when this controller possesses new player character
-void AMyPlayerController::BroadcastOnPossessed()
-{
-	if (!OnPossessed.IsBound())
-	{
-		return;
-	}
-
-	APlayerCharacter* PlayerCharacter = GetPawn<APlayerCharacter>();
-	if (!PlayerCharacter)
-	{
-		return;
-	}
-
-	OnPossessed.Broadcast(PlayerCharacter);
-}
-
 // Is called on server and on client the player state is set
 void AMyPlayerController::BroadcastOnSetPlayerState()
 {

Content/Bomber/Globals/DA_UI.uasset

@@ -7,7 +7,6 @@
 #include "Globals/SingletonLibrary.h"
 #include "LevelActors/PlayerCharacter.h"
 //---
-#include "PoolManager.h"
 #include "Net/UnrealNetwork.h"
 
 /* ---------------------------------------------------
@@ -106,12 +105,6 @@ void AMyPlayerState::ServerUpdateEndState_Implementation()
 		return;
 	}
 
-	const UPoolManager* PoolManager = USingletonLibrary::GetPoolManager();
-	if (!PoolManager)
-	{
-		return;
-	}
-
 	// handle timer is 0
 	if (CurrentGameState == ECurrentGameState::EndGame) // game was finished
 	{
@@ -132,7 +125,7 @@ void AMyPlayerState::ServerUpdateEndState_Implementation()
 	const int32 PlayerNum = USingletonLibrary::GetAlivePlayersNum();
 	const APawn* PawnOwner = GetPawn();
 	if (!PawnOwner
-	    || !PoolManager->IsActive(PawnOwner)) // is dead owner
+	    || !PawnOwner->GetController()) // is dead owner
 	{
 		if (PlayerNum <= 0) // last players were blasted together
 		{
@@ -149,7 +142,7 @@ void AMyPlayerState::ServerUpdateEndState_Implementation()
 	}
 	else if (PlayerNum == 1) // is alive owner and is the last player
 	{
-		if (PawnOwner->GetController<APlayerController>()) // is player
+		if (PawnOwner->IsPlayerControlled())
 		{
 			EndGameStateInternal = EEndGameState::Win;
 		}
@@ -169,3 +162,9 @@ void AMyPlayerState::ServerUpdateEndState_Implementation()
 		OnEndGameStateChanged.Broadcast(EndGameStateInternal);
 	}
 }
+
+// Is called on clients to apply current End-Game state
+void AMyPlayerState::OnRep_EndGameState()
+{
+	OnEndGameStateChanged.Broadcast(EndGameStateInternal);
+}

Content/Bomber/UI/InGame/WBP_InGame.uasset

@@ -15,7 +15,8 @@
 #include "Globals/MyGameInstance.h"
 #include "LevelActors/PlayerCharacter.h"
 #include "UI/MyHUD.h"
-#include "UI/InputControlsWidget.h"
+#include "UI/InGameWidget.h"
+#include "UI/InGameMenuWidget.h"
 //---
 #include "Engine.h"
 #include "PoolManager.h"
@@ -394,13 +395,20 @@ UMainMenuWidget* USingletonLibrary::GetMainMenuWidget()
 	return MyHUD ? MyHUD->GetMainMenuWidget() : nullptr;
 }
 
-// Returns the In-Game Menu widget
+// Returns the In-Game widget
 UInGameWidget* USingletonLibrary::GetInGameWidget()
 {
 	const AMyHUD* MyHUD = GetMyHUD();
 	return MyHUD ? MyHUD->GetInGameWidget() : nullptr;
 }
 
+// Returns the In-Game Menu widget
+UInGameMenuWidget* USingletonLibrary::GetInGameMenuWidget()
+{
+	const UInGameWidget* InGameWidget = GetInGameWidget();
+	return InGameWidget ? InGameWidget->GetInGameMenuWidget() : nullptr;
+}
+
 // Returns specified player character, by default returns local player
 APlayerCharacter* USingletonLibrary::GetPlayerCharacter(int32 PlayerIndex)
 {