Upgrade 4.26

Added "PhysicsCore" to .build.cs Updated source to fix-up any deprecation warnings.
tomlooman · Jun 30, 2021 · 95abaaa · 95abaaa
1 parent 5810b96
commit 95abaaa
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 8 deletions.
diff --git a/CoopGame.uproject b/CoopGame.uproject
@@ -1,6 +1,6 @@
 {
 	"FileVersion": 3,
-	"EngineAssociation": "4.25",
+	"EngineAssociation": "4.26",
 	"Category": "",
 	"Description": "",
 	"Modules": [

diff --git a/Source/CoopGame/CoopGame.Build.cs b/Source/CoopGame/CoopGame.Build.cs
@@ -8,7 +8,7 @@ public CoopGame(ReadOnlyTargetRules Target) : base(Target)
 	{
 		PCHUsage = PCHUsageMode.UseExplicitOrSharedPCHs;
 
-		PublicDependencyModuleNames.AddRange(new string[] { "Core", "CoreUObject", "Engine", "InputCore", "NavigationSystem" });
+		PublicDependencyModuleNames.AddRange(new string[] { "Core", "CoreUObject", "Engine", "InputCore", "NavigationSystem", "PhysicsCore" });
 
 		PrivateDependencyModuleNames.AddRange(new string[] {  });
 

diff --git a/Source/CoopGame/Private/SGameMode.cpp b/Source/CoopGame/Private/SGameMode.cpp
@@ -5,7 +5,7 @@
 #include "SGameState.h"
 #include "SPlayerState.h"
 #include "TimerManager.h"
-
+#include "EngineUtils.h"
 
 
 ASGameMode::ASGameMode()
@@ -61,9 +61,9 @@ void ASGameMode::CheckWaveState()
 
 	bool bIsAnyBotAlive = false;
 
-	for (FConstPawnIterator It = GetWorld()->GetPawnIterator(); It; ++It)
+	for (TActorIterator<APawn> It(GetWorld()); It; ++It)
 	{
-		APawn* TestPawn = It->Get();
+		APawn* TestPawn = *It;
 		if (TestPawn == nullptr || TestPawn->IsPlayerControlled())
 		{
 			continue;

diff --git a/Source/CoopGame/Private/SPlayerState.cpp b/Source/CoopGame/Private/SPlayerState.cpp
@@ -7,5 +7,5 @@
 
 void ASPlayerState::AddScore(float ScoreDelta)
 {
-	Score += ScoreDelta;
+	SetScore(GetScore() + ScoreDelta);
 }
diff --git a/Source/CoopGame/Private/SWeapon.cpp b/Source/CoopGame/Private/SWeapon.cpp
@@ -181,7 +181,7 @@ void ASWeapon::PlayFireEffects(FVector TraceEnd)
 		APlayerController* PC = Cast<APlayerController>(MyOwner->GetController());
 		if (PC)
 		{
-			PC->ClientPlayCameraShake(FireCamShake);
+			PC->ClientStartCameraShake(FireCamShake);
 		}
 	}
 }

diff --git a/Source/CoopGame/Public/SWeapon.h b/Source/CoopGame/Public/SWeapon.h
@@ -68,7 +68,7 @@ class COOPGAME_API ASWeapon : public AActor
 	UParticleSystem* TracerEffect;
 
 	UPROPERTY(EditDefaultsOnly, Category = "Weapon")
-	TSubclassOf<UCameraShake> FireCamShake;
+	TSubclassOf<UCameraShakeBase> FireCamShake;
 
 	UPROPERTY(EditDefaultsOnly, Category = "Weapon")
 	float BaseDamage;
-Original file line number
+Diff line change
@@ Expand Up / @@ -181,7 +181,7 @@ void ASWeapon::PlayFireEffects(FVector TraceEnd) @@
     		APlayerController* PC = Cast<APlayerController>(MyOwner->GetController());
     		if (PC)
     		{
-    			PC->ClientPlayCameraShake(FireCamShake);
+    			PC->ClientStartCameraShake(FireCamShake);
     		}
     	}
     }
@@ Expand Down @@