Rafal/EndlessVendetta
Rafal/EndlessVendetta
1
0
Fork 0
Code Issues Pull Requests Releases 1 Activity

Bugfix Merge Errors

Browse Source
This commit is contained in:
RAFAL SWIERCZEK 2024-02-02 11:42:15 +00:00
parent d943495179
commit fe671e10fc
7 changed files with 28 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
EndlessVendetta/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
EndlessVendetta/Content/FirstPerson/Blueprints/Workbench_WeaponAttachments/BP_WeaponWorkbench.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
EndlessVendetta/Content/FirstPerson/Blueprints/Workbench_WeaponAttachments/Workbench_UI/WBP_Workbench.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
EndlessVendetta/Content/StarterContent/Architecture/Floor_400x400.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
EndlessVendetta/Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
EndlessVendetta/Content/StarterContent/Particles/P_Ambient_Dust.uasset (Stored with Git LFS)
View File

Binary file not shown.

10
EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.cpp
View File

@ -53,8 +53,11 @@ void AEndlessVendettaCharacter::BeginPlay()
Super::BeginPlay(); Super::BeginPlay();
UEVGameInstance* GI = Cast<UEVGameInstance>(GetWorld()->GetGameInstance()); UEVGameInstance* GI = Cast<UEVGameInstance>(GetWorld()->GetGameInstance());
if (IsValid(GI->MainSaveGameInstanceRef))
{
PrimaryWeaponClass = GI->MainSaveGameInstanceRef->PrimaryWeaponClassSave; PrimaryWeaponClass = GI->MainSaveGameInstanceRef->PrimaryWeaponClassSave;
SecondaryWeaponClass = GI->MainSaveGameInstanceRef->SecondaryWeaponClassSave; SecondaryWeaponClass = GI->MainSaveGameInstanceRef->SecondaryWeaponClassSave;
}
// Set the fp skeletal mesh for the vault it plugin to use // Set the fp skeletal mesh for the vault it plugin to use
TArray<UActorComponent*> MeshActComps = GetComponentsByClass(USkeletalMeshComponent::StaticClass()); TArray<UActorComponent*> MeshActComps = GetComponentsByClass(USkeletalMeshComponent::StaticClass());
@ -481,8 +484,12 @@ void AEndlessVendettaCharacter::WeaponSwitcher(AActor* Outhit)
PrimaryWeaponClass = Outhit->GetClass(); PrimaryWeaponClass = Outhit->GetClass();
UEVGameInstance* GI = Cast<UEVGameInstance>(GetGameInstance()); UEVGameInstance* GI = Cast<UEVGameInstance>(GetGameInstance());
if (IsValid(GI->MainSaveGameInstanceRef))
{
GI->MainSaveGameInstanceRef->PrimaryWeaponClassSave = Outhit->GetClass(); GI->MainSaveGameInstanceRef->PrimaryWeaponClassSave = Outhit->GetClass();
UGameplayStatics::SaveGameToSlot(GI->MainSaveGameInstanceRef, "MainSave", 0); UGameplayStatics::SaveGameToSlot(GI->MainSaveGameInstanceRef, "MainSave", 0);
}
Outhit->Destroy(); Outhit->Destroy();
EquipPrimary(); EquipPrimary();
@ -497,8 +504,11 @@ void AEndlessVendettaCharacter::WeaponSwitcher(AActor* Outhit)
SecondaryWeaponClass = Outhit->GetClass(); SecondaryWeaponClass = Outhit->GetClass();
UEVGameInstance* GI = Cast<UEVGameInstance>(GetGameInstance()); UEVGameInstance* GI = Cast<UEVGameInstance>(GetGameInstance());
if (IsValid(GI->MainSaveGameInstanceRef))
{
GI->MainSaveGameInstanceRef->SecondaryWeaponClassSave = Outhit->GetClass(); GI->MainSaveGameInstanceRef->SecondaryWeaponClassSave = Outhit->GetClass();
UGameplayStatics::SaveGameToSlot(GI->MainSaveGameInstanceRef, "MainSave", 0); UGameplayStatics::SaveGameToSlot(GI->MainSaveGameInstanceRef, "MainSave", 0);
}
Outhit->Destroy(); Outhit->Destroy();
EquipSecondary(); EquipSecondary();