Merge pull request #60 from Firefly74940/master

4.23 compatibility
EverNewJoy · Sep 6, 2019 · b4d23b9 · b4d23b9
2 parents 070cb8a + 82631aa
commit b4d23b9
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 10 deletions.
diff --git a/Source/VictoryBPLibrary/Private/VictoryBPFunctionLibrary.cpp b/Source/VictoryBPLibrary/Private/VictoryBPFunctionLibrary.cpp
@@ -1031,7 +1031,7 @@ void UVictoryBPFunctionLibrary::VictoryGetAllAxisKeyBindings(TArray<FVictoryInpu
 	const UInputSettings* Settings = GetDefault<UInputSettings>();
 	if(!Settings) return;
 
-	const TArray<FInputAxisKeyMapping>& Axi = Settings->AxisMappings;
+	const TArray<FInputAxisKeyMapping>& Axi = Settings->GetAxisMappings();
 
 	for(const FInputAxisKeyMapping& Each : Axi)
 	{
@@ -1044,7 +1044,7 @@ void UVictoryBPFunctionLibrary::VictoryRemoveAxisKeyBind(FVictoryInputAxis ToRem
 	UInputSettings* Settings = GetMutableDefault<UInputSettings>();
 	if(!Settings) return;
 
-	TArray<FInputAxisKeyMapping>& Axi = Settings->AxisMappings;
+	TArray<FInputAxisKeyMapping>& Axi = const_cast<TArray<FInputAxisKeyMapping>&>(Settings->GetAxisMappings());
 
 	bool Found = false;
 	for(int32 v = 0; v < Axi.Num(); v++)
@@ -1078,7 +1078,7 @@ void UVictoryBPFunctionLibrary::VictoryGetAllActionKeyBindings(TArray<FVictoryIn
 	const UInputSettings* Settings = GetDefault<UInputSettings>();
 	if(!Settings) return;
 
-	const TArray<FInputActionKeyMapping>& Actions = Settings->ActionMappings;
+	const TArray<FInputActionKeyMapping>& Actions = Settings->GetActionMappings();
 
 	for(const FInputActionKeyMapping& Each : Actions)
 	{
@@ -1092,7 +1092,7 @@ void UVictoryBPFunctionLibrary::VictoryRemoveActionKeyBind(FVictoryInput ToRemov
 	UInputSettings* Settings = GetMutableDefault<UInputSettings>();
 	if(!Settings) return;
 
-	TArray<FInputActionKeyMapping>& Actions = Settings->ActionMappings;
+	TArray<FInputActionKeyMapping>& Actions = const_cast<TArray<FInputActionKeyMapping>&>(Settings->GetActionMappings());
 
 	bool Found = false;
 	for(int32 v = 0; v < Actions.Num(); v++)
@@ -1127,7 +1127,7 @@ void UVictoryBPFunctionLibrary::VictoryGetAllAxisAndActionMappingsForKey(FKey Ke
 		const UInputSettings* Settings = GetDefault<UInputSettings>();
 	if(!Settings) return;
 
-	const TArray<FInputActionKeyMapping>& Actions = Settings->ActionMappings;
+	const TArray<FInputActionKeyMapping>& Actions = Settings->GetActionMappings();
 
 	for(const FInputActionKeyMapping& Each : Actions)
 	{
@@ -1137,7 +1137,7 @@ void UVictoryBPFunctionLibrary::VictoryGetAllAxisAndActionMappingsForKey(FKey Ke
 		}
 	}
 
-	const TArray<FInputAxisKeyMapping>& Axi = Settings->AxisMappings;
+	const TArray<FInputAxisKeyMapping>& Axi = Settings->GetAxisMappings();
 
 	for(const FInputAxisKeyMapping& Each : Axi)
 	{  
@@ -1152,7 +1152,7 @@ bool UVictoryBPFunctionLibrary::VictoryReBindAxisKey(FVictoryInputAxis Original,
 	UInputSettings* Settings = const_cast<UInputSettings*>(GetDefault<UInputSettings>());
 	if(!Settings) return false;
 
-	TArray<FInputAxisKeyMapping>& Axi = Settings->AxisMappings;
+	TArray<FInputAxisKeyMapping>& Axi = const_cast<TArray<FInputAxisKeyMapping>&>(Settings->GetAxisMappings());
 
 	//~~~
 
@@ -1189,7 +1189,7 @@ bool UVictoryBPFunctionLibrary::VictoryReBindActionKey(FVictoryInput Original, F
 	UInputSettings* Settings = const_cast<UInputSettings*>(GetDefault<UInputSettings>());
 	if(!Settings) return false;
 
-	TArray<FInputActionKeyMapping>& Actions = Settings->ActionMappings;
+	TArray<FInputActionKeyMapping>& Actions = const_cast<TArray<FInputActionKeyMapping>&>(Settings->GetActionMappings());
 
 	//~~~
 
@@ -4665,7 +4665,7 @@ int32 UVictoryBPFunctionLibrary::findSource(class USoundWave* sw, class FSoundSo
 		for (auto activeSoundIt(tmpActualSounds.CreateIterator()); activeSoundIt; ++activeSoundIt)
 		{
 			activeSound = *activeSoundIt;
-			for (auto WaveInstanceIt(activeSound->WaveInstances.CreateIterator()); WaveInstanceIt; ++WaveInstanceIt)
+			for (auto WaveInstanceIt(activeSound->GetWaveInstances().CreateConstIterator()); WaveInstanceIt; ++WaveInstanceIt)
 			{
 				sw_instance = WaveInstanceIt.Value();
 				if (sw_instance->WaveData->CompressedDataGuid == sw->CompressedDataGuid)

diff --git a/Source/VictoryBPLibrary/VictoryBPLibrary.Build.cs b/Source/VictoryBPLibrary/VictoryBPLibrary.Build.cs
@@ -53,7 +53,8 @@ public VictoryBPLibrary(ReadOnlyTargetRules Target) : base(Target)
 				"UMG", "Slate", "SlateCore",
 
 				"ImageWrapper",
-
+
+                "PhysicsCore", 
 				"PhysX", 
 
 				"HeadMountedDisplay",