206 - Player Bookkeeping

Source/Blaster/Character/BlasterCharacter.cpp

@@ -171,21 +171,15 @@ void ABlasterCharacter::OnRep_ReplicatedMovement()
 	TimeSinceLastMovementReplication = 0.f;
 }
 
-void ABlasterCharacter::Eliminated()
+void ABlasterCharacter::Eliminated(bool bPlayerLeftGame)
 {
 	if (Combat) Combat->DropWeapons();
-
-	MulticastEliminated();
-	GetWorldTimerManager().SetTimer(
-		EliminationTimer,
-		this,
-		&ABlasterCharacter::EliminationTimerFinished,
-		EliminationDelay
-	);
+	MulticastEliminated(bPlayerLeftGame);
 }
 
-void ABlasterCharacter::MulticastEliminated_Implementation()
+void ABlasterCharacter::MulticastEliminated_Implementation(bool bPlayerLeftGame)
 {
+	bLeftGame = bPlayerLeftGame;
 	if (BlasterPlayerController)
 	{
 		BlasterPlayerController->SetHUDWeaponAmmo(0);
@@ -237,15 +231,36 @@ void ABlasterCharacter::MulticastEliminated_Implementation()
 	{
 		ShowSniperScopeWidget(false);
 	}
+		
+	GetWorldTimerManager().SetTimer(
+		EliminationTimer,
+		this,
+		&ABlasterCharacter::EliminationTimerFinished,
+		EliminationDelay
+	);
 }
 
 void ABlasterCharacter::EliminationTimerFinished()
 {
 	ABlasterGameMode* BlasterGameMode = GetWorld()->GetAuthGameMode<ABlasterGameMode>();
-	if (BlasterGameMode)
+	if (BlasterGameMode && !bLeftGame)
 	{
 		BlasterGameMode->RequestRespawn(this, Controller);
 	}
+	if (bLeftGame && IsLocallyControlled())
+	{
+		OnLeftGame.Broadcast();
+	}
+}
+
+void ABlasterCharacter::ServerLeaveGame_Implementation()
+{
+	ABlasterGameMode* BlasterGameMode = GetWorld()->GetAuthGameMode<ABlasterGameMode>();
+	BlasterPlayerState = BlasterPlayerState == nullptr ? GetPlayerState<ABlasterPlayerState>() : BlasterPlayerState;
+	if (BlasterGameMode && BlasterPlayerState)
+	{
+		BlasterGameMode->PlayerLeftGame(BlasterPlayerState);
+	}
 }
 
 void ABlasterCharacter::Destroyed()

Source/Blaster/Character/BlasterCharacter.h

@@ -11,6 +11,8 @@
 #include "Sound/SoundCue.h"
 #include "BlasterCharacter.generated.h"
 
+DECLARE_DYNAMIC_MULTICAST_DELEGATE(FOnLeftGame);
+
 UCLASS()
 class BLASTER_API ABlasterCharacter : public ACharacter, public IInteractWithCrosshairInterface
 {
@@ -33,10 +35,10 @@ public:
 	void PlayThrowGrenadeMontage();
 	void PlaySwapMontage();
 
-	void Eliminated();
+	void Eliminated(bool bPlayerLeftGame);
 	
 	UFUNCTION(NetMulticast, Reliable)
-	void MulticastEliminated();
+	void MulticastEliminated(bool bPlayerLeftGame);
 
 	UPROPERTY(Replicated)
 	bool bDisableGameplay = false;
@@ -53,6 +55,11 @@ public:
 	TMap<FName, class UBoxComponent*> HitCollisionBoxes;
 
 	bool bFinishedSwapping = false;
+	
+	UFUNCTION(Server, Reliable)
+	void ServerLeaveGame();
+	
+	FOnLeftGame OnLeftGame;
 protected:
 	virtual void BeginPlay() override;
 
@@ -244,6 +251,8 @@ private:
 
 	void EliminationTimerFinished();
 
+	bool bLeftGame = false;
+	
 	// Dissolve effect
 	UPROPERTY(VisibleAnywhere)
 	UTimelineComponent* DissolveTimeline;

Source/Blaster/GameMode/BlasterGameMode.cpp

@@ -93,7 +93,7 @@ void ABlasterGameMode::PlayerEliminated(class ABlasterCharacter* EliminatedChara
 	
 	if (EliminatedCharacter)
 	{
-		EliminatedCharacter->Eliminated();
+		EliminatedCharacter->Eliminated(false);
 	}
 }
 
@@ -112,3 +112,18 @@ void ABlasterGameMode::RequestRespawn(ACharacter* EliminatedCharacter, AControll
 		RestartPlayerAtPlayerStart(EliminatedController, PlayerStarts[Selection]);
 	}
 }
+
+void ABlasterGameMode::PlayerLeftGame(ABlasterPlayerState* PlayerLeaving)
+{
+	if (PlayerLeaving == nullptr) return;
+	ABlasterGameState* BlasterGameState = GetGameState<ABlasterGameState>();
+	if (BlasterGameState && BlasterGameState->TopScoringPlayers.Contains(PlayerLeaving))
+	{
+		BlasterGameState->TopScoringPlayers.Remove(PlayerLeaving);
+	}
+
+	if (ABlasterCharacter* CharacterLeaving = Cast<ABlasterCharacter>(PlayerLeaving->GetPawn()))
+	{
+		CharacterLeaving->Eliminated(true);
+	}
+}

Source/Blaster/GameMode/BlasterGameMode.h

@@ -3,6 +3,7 @@
 #pragma once
 
 #include "CoreMinimal.h"
+#include "Blaster/PlayerState/BlasterPlayerState.h"
 #include "GameFramework/GameMode.h"
 #include "BlasterGameMode.generated.h"
 
@@ -26,6 +27,7 @@ public:
 	virtual void PlayerEliminated(class ABlasterCharacter* EliminatedCharacter, class ABlasterPlayerController* VictimController,
 	                              class ABlasterPlayerController* AttackerController);
 	virtual void RequestRespawn(ACharacter* EliminatedCharacter, AController* EliminatedController);
+	void PlayerLeftGame(ABlasterPlayerState* PlayerLeaving);
 	
 	UPROPERTY(EditDefaultsOnly)
 	float WarmupTime = 10.f;

Source/Blaster/HUD/ReturnToMainMenu.cpp

@@ -3,6 +3,7 @@
 
 #include "ReturnToMainMenu.h"
 #include "MultiplayerSessionsSubsystem.h"
+#include "Blaster/Character/BlasterCharacter.h"
 #include "Components/Button.h"
 #include "GameFramework/GameModeBase.h"
 
@@ -74,10 +75,33 @@ void UReturnToMainMenu::MenuTearDown()
 }
 
 void UReturnToMainMenu::ReturnButtonClicked()
+{
+	ReturnButton->SetIsEnabled(false);
+
+	if (const UWorld* World = GetWorld())
+	{
+		if (const APlayerController* FirstPlayerController = World->GetFirstPlayerController())
+		{
+			if (ABlasterCharacter* BlasterCharacter = Cast<ABlasterCharacter>(FirstPlayerController->GetPawn()))
+			{
+				BlasterCharacter->ServerLeaveGame();
+				if (!BlasterCharacter->OnLeftGame.IsBound())
+				{
+					BlasterCharacter->OnLeftGame.AddDynamic(this, &UReturnToMainMenu::OnPlayerLeftGame);
+				}
+			}
+			else
+			{
+				ReturnButton->SetIsEnabled(true);
+			}
+		}
+	}
+}
+
+void UReturnToMainMenu::OnPlayerLeftGame()
 {
 	if (MultiplayerSessionsSubsystem)
 	{
-		ReturnButton->SetIsEnabled(false);
 		MultiplayerSessionsSubsystem->DestroySession();
 	}	
 }

Source/Blaster/HUD/ReturnToMainMenu.h

@@ -20,8 +20,13 @@ public:
 
 protected:
 	virtual bool Initialize() override;
+	
 	UFUNCTION()
 	void OnDestroySessionComplete(bool bWasSuccessful);
+
+	UFUNCTION()
+	void OnPlayerLeftGame();
+	
 private:
 
 	UPROPERTY(meta = (BindWidget))