Fixes to replays and tweaked audio volume

Nick-Pearson · May 8, 2018 · c6556b5 · c6556b5
1 parent 89a22cc
commit c6556b5
Show file tree

Hide file tree

Showing 10 changed files with 47 additions and 9 deletions.
diff --git a/ParkourGame/Content/Audio/Crowd/Crowd_Ambient.uasset b/ParkourGame/Content/Audio/Crowd/Crowd_Ambient.uasset
diff --git a/ParkourGame/Content/Audio/Effects.uasset b/ParkourGame/Content/Audio/Effects.uasset
diff --git a/ParkourGame/Content/Audio/GameMaster.uasset b/ParkourGame/Content/Audio/GameMaster.uasset
diff --git a/ParkourGame/Content/ThirdPersonCPP/Blueprints/ThirdPersonCharacter.uasset b/ParkourGame/Content/ThirdPersonCPP/Blueprints/ThirdPersonCharacter.uasset
diff --git a/ParkourGame/Source/ParkourGame/Private/Core/ParkourGameState.cpp b/ParkourGame/Source/ParkourGame/Private/Core/ParkourGameState.cpp
@@ -1,7 +1,17 @@
 #include "ParkourGameState.h"
+#include "../Spectator/ReplayManager.h"
+#include "../Utils/SingletonHelper.h"
 
 void AParkourGameState::Net_PlayAnnouncerSound_Implementation(EAnnouncerSound Sound)
 {
   if(!HasAuthority())
     PlayAnnouncerSound(Sound);
 }
+
+void AParkourGameState::Net_RegisterForReplay_Implementation(AActor* Actor)
+{
+  AReplayManager* Replay = FSingletonHelper::Static_GetSingletonObject<AReplayManager>(GetWorld());
+
+  if (Replay)
+    Replay->RegisterActorForReplay(Actor);
+}
diff --git a/ParkourGame/Source/ParkourGame/Private/Core/ParkourGameState.h b/ParkourGame/Source/ParkourGame/Private/Core/ParkourGameState.h
@@ -24,6 +24,9 @@ class AParkourGameState : public AGameStateBase
   UFUNCTION(BlueprintCallable, NetMulticast, Unreliable, Category = "Audio")
   void Net_PlayAnnouncerSound(EAnnouncerSound Sound);
 
+  UFUNCTION(NetMulticast, Reliable)
+  void Net_RegisterForReplay(AActor* Actor);
+
   UFUNCTION(BlueprintImplementableEvent, Category = "Audio")
   void PlayAnnouncerSound(EAnnouncerSound Sound);
 

diff --git a/ParkourGame/Source/ParkourGame/Private/Core/ParkourPlayerController.cpp b/ParkourGame/Source/ParkourGame/Private/Core/ParkourPlayerController.cpp
@@ -63,3 +63,13 @@ void AParkourPlayerController::SetPawn(APawn* InPawn)
       Replay->RegisterActorForReplay(Char);
   }
 }
+
+void AParkourPlayerController::BeginPlay()
+{
+  Super::BeginPlay();
+
+  if (AParkourGameCharacter* Char = Cast<AParkourGameCharacter>(GetPawn()))
+  {
+    Cast<AParkourGameState>(GetWorld()->GetGameState())->Net_RegisterForReplay(Char);
+  }
+}
diff --git a/ParkourGame/Source/ParkourGame/Private/Core/ParkourPlayerController.h b/ParkourGame/Source/ParkourGame/Private/Core/ParkourPlayerController.h
@@ -31,4 +31,7 @@ class AParkourPlayerController : public APlayerController
 
   virtual void SetPawn(APawn* InPawn) override;
 
+protected:
+  virtual void BeginPlay() override;
+
 };
diff --git a/ParkourGame/Source/ParkourGame/Private/Spectator/ReplayManager.cpp b/ParkourGame/Source/ParkourGame/Private/Spectator/ReplayManager.cpp
@@ -70,6 +70,11 @@ void AReplayManager::Tick(float DeltaSeconds)
 	{
 		UpdateReplay(CurrentTime);
 	}
+
+  for (TActorIterator<AParkourGameCharacter> It(GetWorld()); It; ++It)
+  {
+    SetupNewPlayer((*It)->GetController(), (*It));
+  }
 }
 
 void AReplayManager::SetRecording(bool bShouldRecord)
@@ -360,6 +365,13 @@ void AReplayManager::UpdatePlayerReplay(FPlayerReplayData& Player, float ReplayT
 
 void AReplayManager::SetupNewPlayer(AController* Controller, AActor* Player)
 {
+  // ensure no duplicates
+  FPlayerReplayData* DataPtr = m_KeyframeData.FindByPredicate([&](const FPlayerReplayData& Data) {
+    return Data.RealActor == Player;
+  });
+
+  if (DataPtr) return;
+
   FPlayerReplayData& NewEntry = m_KeyframeData[m_KeyframeData.AddDefaulted()];
 
   NewEntry.PlayerController = Controller;

diff --git a/ParkourGame/Source/ParkourGame/Private/Utils/GameVersion.h b/ParkourGame/Source/ParkourGame/Private/Utils/GameVersion.h
@@ -6,7 +6,7 @@
 
 #define GAME_VERSION_MAJOR 0
 #define GAME_VERSION_MINOR 11
-#define GAME_VERSION_PATCH 1
+#define GAME_VERSION_PATCH 2
 
 USTRUCT(BlueprintType)
 struct FGameVersion