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

Bugfix Primary Rifles Appear off screen

Browse Source
This commit is contained in:
Rafal Swierczek 2024-03-17 21:57:01 +00:00
parent 3633e1fe24
commit 530c9580ff
9 changed files with 24 additions and 12 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/BP_MainCharacter.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/Pistols/BP_BasePistolWeapon.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/Blueprints/Blueprint_CeilingLight.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
EndlessVendetta/Content/__ExternalActors__/Levels/AITest/0/FP/C223QQ2RGQBAGPV9BEDZ77.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

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

@ -397,6 +397,7 @@ void AEndlessVendettaCharacter::EquipPrimary()
if (bIsReloading) return; if (bIsReloading) return;
if (IsValid(PrimaryWeapon)) if (IsValid(PrimaryWeapon))
{ {
TempUnequippedPrimary();
GEngine->AddOnScreenDebugMessage(-1, 15.f, FColor::Red, TEXT("IsPrimaryWeapon valid check running")); GEngine->AddOnScreenDebugMessage(-1, 15.f, FColor::Red, TEXT("IsPrimaryWeapon valid check running"));
PrimaryWeapon->DetachFromActor(DetatchRules); PrimaryWeapon->DetachFromActor(DetatchRules);
PrimaryWeapon->AttachToComponent(FirstPersonArms, AttachmentRules, FName("UnEquipGunSocket")); PrimaryWeapon->AttachToComponent(FirstPersonArms, AttachmentRules, FName("UnEquipGunSocket"));
@ -439,7 +440,7 @@ void AEndlessVendettaCharacter::EquipPrimary()
} }
//For when you already have all your weapons and ur switching with 1 and 2 or when your picking up a weapon with a weapon in hand //For when you already have all your weapons and ur switching with 1 and 2 or when your picking up a weapon with a weapon in hand
if (PrimaryWeaponClass != nullptr) if (PrimaryWeaponClass != nullptr)
{ {
GEngine->AddOnScreenDebugMessage(-1, 15.f, FColor::Green, TEXT("non ifstatement code running")); GEngine->AddOnScreenDebugMessage(-1, 15.f, FColor::Green, TEXT("non ifstatement code running"));
PrimaryWeaponActor->AttachToComponent(FirstPersonArms, AttachmentRules, FName("GripPoint")); PrimaryWeaponActor->AttachToComponent(FirstPersonArms, AttachmentRules, FName("GripPoint"));
PrimaryWeapon = Cast<ABaseWeaponClass>(PrimaryWeaponActor); PrimaryWeapon = Cast<ABaseWeaponClass>(PrimaryWeaponActor);
@ -449,6 +450,7 @@ void AEndlessVendettaCharacter::EquipPrimary()
bIsCurrentlyHoldingWeapon = true; bIsCurrentlyHoldingWeapon = true;
bHasRifle = true; bHasRifle = true;
SetOverlayState(EOverlayState::AssaultRifle); SetOverlayState(EOverlayState::AssaultRifle);
TempEquippedPrimary();
} }
} }

7
EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.h
View File

@ -35,6 +35,11 @@ UCLASS(config=Game)
class AEndlessVendettaCharacter : public ACharacter class AEndlessVendettaCharacter : public ACharacter
{ {
GENERATED_BODY() GENERATED_BODY()
public:
UFUNCTION(BlueprintImplementableEvent)
void TempEquippedPrimary();
UFUNCTION(BlueprintImplementableEvent)
void TempUnequippedPrimary();
protected: protected:
/** Pawn mesh: 1st person view (arms; seen only by self) */ /** Pawn mesh: 1st person view (arms; seen only by self) */
@ -311,7 +316,9 @@ public:
void WeaponPickUpSystem(); void WeaponPickUpSystem();
UFUNCTION(BlueprintCallable)
void EquipPrimary(); void EquipPrimary();
UFUNCTION(BlueprintCallable)
void EquipSecondary(); void EquipSecondary();
void WeaponSwitcher(AActor* Outhit); void WeaponSwitcher(AActor* Outhit);

2
EndlessVendetta/Source/EndlessVendetta/WeaponSystem/BaseWeaponClass.cpp
View File

@ -47,7 +47,7 @@ void ABaseWeaponClass::BeginPlay()
if (!IsValid(endlessVendettaChar)) return; if (!IsValid(endlessVendettaChar)) return;
for (UActorComponent* actorComp : endlessVendettaChar->GetComponentsByTag(UArrowComponent::StaticClass(), FName("GunStart"))) for (UActorComponent* actorComp : playerInWorld->GetComponentsByTag(UArrowComponent::StaticClass(), FName("GunStart")))
{ {
GunStartArrow = Cast<UArrowComponent>(actorComp); GunStartArrow = Cast<UArrowComponent>(actorComp);
break; break;