From fe671e10fc3a4991f7e66346276df05bf5e05335 Mon Sep 17 00:00:00 2001 From: RAFAL SWIERCZEK Date: Fri, 2 Feb 2024 11:42:15 +0000 Subject: [PATCH] Bugfix Merge Errors --- .../Blueprints/BP_FirstPersonCharacter.uasset | 4 ++-- .../BP_WeaponWorkbench.uasset | 4 ++-- .../Workbench_UI/WBP_Workbench.uasset | 4 ++-- .../Architecture/Floor_400x400.uasset | 4 ++-- .../HDRI/HDRI_Epic_Courtyard_Daylight.uasset | 4 ++-- .../Particles/P_Ambient_Dust.uasset | 4 ++-- .../EndlessVendettaCharacter.cpp | 22 ++++++++++++++----- 7 files changed, 28 insertions(+), 18 deletions(-) diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset index a0aa8667..46367c77 100644 --- a/EndlessVendetta/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset +++ b/EndlessVendetta/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2c7bbe0e841e41f594ccb33dfaa31a8d80c43cf21a86cddb92bf0c665b214cec -size 457638 +oid sha256:f8ca10fde945fbab4c1f76b326cd5808c53a338dedd01c73be8ae655552aa31c +size 474080 diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/Workbench_WeaponAttachments/BP_WeaponWorkbench.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/Workbench_WeaponAttachments/BP_WeaponWorkbench.uasset index 9ed6e4f1..065961de 100644 --- a/EndlessVendetta/Content/FirstPerson/Blueprints/Workbench_WeaponAttachments/BP_WeaponWorkbench.uasset +++ b/EndlessVendetta/Content/FirstPerson/Blueprints/Workbench_WeaponAttachments/BP_WeaponWorkbench.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a90f10864a9825562cc3a8bb9972d912211f53477d808ae9252142fb3b197a85 -size 146446 +oid sha256:d75e36753040dd1b42758b69e6c786086cdef6c0bb189130b8d0e611ba119da9 +size 139146 diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/Workbench_WeaponAttachments/Workbench_UI/WBP_Workbench.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/Workbench_WeaponAttachments/Workbench_UI/WBP_Workbench.uasset index e02c45b6..ec08dd4c 100644 --- a/EndlessVendetta/Content/FirstPerson/Blueprints/Workbench_WeaponAttachments/Workbench_UI/WBP_Workbench.uasset +++ b/EndlessVendetta/Content/FirstPerson/Blueprints/Workbench_WeaponAttachments/Workbench_UI/WBP_Workbench.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cd7b744f17e4d12932b8bc8d1452dcc9d3e54cc83c20d46cd3e8e063a96f11a3 -size 227800 +oid sha256:26e12a1e4c8c9e552111d447a43b2e8518c1f916d96239e30a9699079dd04d3f +size 228620 diff --git a/EndlessVendetta/Content/StarterContent/Architecture/Floor_400x400.uasset b/EndlessVendetta/Content/StarterContent/Architecture/Floor_400x400.uasset index a2222591..c2a34afc 100644 --- a/EndlessVendetta/Content/StarterContent/Architecture/Floor_400x400.uasset +++ b/EndlessVendetta/Content/StarterContent/Architecture/Floor_400x400.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:61d130e2bfe7d6048f25eb87b7a0936a887ed73ad7fdc29737bbd57569345cac -size 14831 +oid sha256:4c0ecf0ac0702cc2bd355ec050232a61c49e10f102448efbeb735a51824adef6 +size 14948 diff --git a/EndlessVendetta/Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset b/EndlessVendetta/Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset index 0f990580..bcdd46be 100644 --- a/EndlessVendetta/Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset +++ b/EndlessVendetta/Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bc35eb2d43a47427d30aba0196f9eac90d089dd3abca319528c5d25c83510d0d -size 72364642 +oid sha256:17ed9eda8d618cf2df6ebb17a13ba47e9bbf3db53ce81be9a332fe71b78cbd23 +size 66790690 diff --git a/EndlessVendetta/Content/StarterContent/Particles/P_Ambient_Dust.uasset b/EndlessVendetta/Content/StarterContent/Particles/P_Ambient_Dust.uasset index ff277171..bf2e4391 100644 --- a/EndlessVendetta/Content/StarterContent/Particles/P_Ambient_Dust.uasset +++ b/EndlessVendetta/Content/StarterContent/Particles/P_Ambient_Dust.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:88536082006c52f9839140df065cb0cd6e96a7ca3ba2f95bb6002971c467a2e6 -size 53268 +oid sha256:01ef616c7a8bd90cd1b7a13efb18a56f33346efbae51efa31f09804478b7621d +size 43456 diff --git a/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.cpp b/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.cpp index 9b39327f..4bf27204 100644 --- a/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.cpp +++ b/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.cpp @@ -53,8 +53,11 @@ void AEndlessVendettaCharacter::BeginPlay() Super::BeginPlay(); UEVGameInstance* GI = Cast(GetWorld()->GetGameInstance()); - PrimaryWeaponClass = GI->MainSaveGameInstanceRef->PrimaryWeaponClassSave; - SecondaryWeaponClass = GI->MainSaveGameInstanceRef->SecondaryWeaponClassSave; + if (IsValid(GI->MainSaveGameInstanceRef)) + { + PrimaryWeaponClass = GI->MainSaveGameInstanceRef->PrimaryWeaponClassSave; + SecondaryWeaponClass = GI->MainSaveGameInstanceRef->SecondaryWeaponClassSave; + } // Set the fp skeletal mesh for the vault it plugin to use TArray MeshActComps = GetComponentsByClass(USkeletalMeshComponent::StaticClass()); @@ -481,8 +484,12 @@ void AEndlessVendettaCharacter::WeaponSwitcher(AActor* Outhit) PrimaryWeaponClass = Outhit->GetClass(); UEVGameInstance* GI = Cast(GetGameInstance()); - GI->MainSaveGameInstanceRef->PrimaryWeaponClassSave = Outhit->GetClass(); - UGameplayStatics::SaveGameToSlot(GI->MainSaveGameInstanceRef, "MainSave", 0); + if (IsValid(GI->MainSaveGameInstanceRef)) + { + GI->MainSaveGameInstanceRef->PrimaryWeaponClassSave = Outhit->GetClass(); + UGameplayStatics::SaveGameToSlot(GI->MainSaveGameInstanceRef, "MainSave", 0); + } + Outhit->Destroy(); EquipPrimary(); @@ -497,8 +504,11 @@ void AEndlessVendettaCharacter::WeaponSwitcher(AActor* Outhit) SecondaryWeaponClass = Outhit->GetClass(); UEVGameInstance* GI = Cast(GetGameInstance()); - GI->MainSaveGameInstanceRef->SecondaryWeaponClassSave = Outhit->GetClass(); - UGameplayStatics::SaveGameToSlot(GI->MainSaveGameInstanceRef, "MainSave", 0); + if (IsValid(GI->MainSaveGameInstanceRef)) + { + GI->MainSaveGameInstanceRef->SecondaryWeaponClassSave = Outhit->GetClass(); + UGameplayStatics::SaveGameToSlot(GI->MainSaveGameInstanceRef, "MainSave", 0); + } Outhit->Destroy(); EquipSecondary();