diff --git a/Content/Player/CPlayerCharacter_BP.uasset b/Content/Player/CPlayerCharacter_BP.uasset index 9969f51..e5e97e8 100644 --- a/Content/Player/CPlayerCharacter_BP.uasset +++ b/Content/Player/CPlayerCharacter_BP.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:77eebe4e07241e471e2bcbef6ad0c5af139c7918c83490af4fd09ff2a18a05bd -size 30245 +oid sha256:3fcdc78b2ec48c68bb6738748474869f4ea4fbc46e1e156ecee87e20779b7b45 +size 30440 diff --git a/Content/__ExternalActors__/TempLevel/0/O7/HFF6ETA4ZE9NY8DR7B5RMP.uasset b/Content/__ExternalActors__/TempLevel/0/O7/HFF6ETA4ZE9NY8DR7B5RMP.uasset new file mode 100644 index 0000000..481661e --- /dev/null +++ b/Content/__ExternalActors__/TempLevel/0/O7/HFF6ETA4ZE9NY8DR7B5RMP.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0ae6b97d77338337f18523b0febe775b8f933e4a8a3c31b0f8742336e66c4825 +size 4129 diff --git a/Content/__ExternalActors__/TempLevel/6/67/01SC3MK1YVTR9FL7SKC1X6.uasset b/Content/__ExternalActors__/TempLevel/6/67/01SC3MK1YVTR9FL7SKC1X6.uasset new file mode 100644 index 0000000..61b71a3 --- /dev/null +++ b/Content/__ExternalActors__/TempLevel/6/67/01SC3MK1YVTR9FL7SKC1X6.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:86fca4d49b8149d8baf9f911b31df9d5c2e5cd9b84d9ab83b727af9b8db8153b +size 4129 diff --git a/Source/Crunch/Private/GAS/CAttributeSet.cpp b/Source/Crunch/Private/GAS/CAttributeSet.cpp index 3607cc6..229984a 100644 --- a/Source/Crunch/Private/GAS/CAttributeSet.cpp +++ b/Source/Crunch/Private/GAS/CAttributeSet.cpp @@ -5,7 +5,7 @@ #include "Net/UnrealNetwork.h" -void UCAttributeSet::GetLifetimeReplicatedProps(TArray& OutLifetimeProps) const +void UCAttributeSet::GetLifetimeReplicatedProps(TArray& OutLifetimeProps) const { Super::GetLifetimeReplicatedProps(OutLifetimeProps); DOREPLIFETIME_CONDITION_NOTIFY(UCAttributeSet, Health, COND_None, REPNOTIFY_Always); @@ -18,6 +18,7 @@ void UCAttributeSet::OnRep_Health(const FGameplayAttributeData& OldValue) { GAMEPLAYATTRIBUTE_REPNOTIFY(UCAttributeSet, Health, OldValue); } + void UCAttributeSet::OnRep_MaxHealth(const FGameplayAttributeData& OldValue) { GAMEPLAYATTRIBUTE_REPNOTIFY(UCAttributeSet, MaxHealth, OldValue); diff --git a/Source/Crunch/Private/Player/CPlayerController.cpp b/Source/Crunch/Private/Player/CPlayerController.cpp index 4812c08..21bdc34 100644 --- a/Source/Crunch/Private/Player/CPlayerController.cpp +++ b/Source/Crunch/Private/Player/CPlayerController.cpp @@ -14,7 +14,7 @@ void ACPlayerController::OnPossess(APawn* InPawn) } } -void ACPlayerController::AcknowledgePossession(class APawn* P) +void ACPlayerController::AcknowledgePossession(APawn* P) { Super::AcknowledgePossession(P); if (CPlayerCharacter = Cast(P); IsValid(CPlayerCharacter)) diff --git a/Source/Crunch/Public/Animations/CAnimInstance.h b/Source/Crunch/Public/Animations/CAnimInstance.h index 552a833..f8fda5c 100644 --- a/Source/Crunch/Public/Animations/CAnimInstance.h +++ b/Source/Crunch/Public/Animations/CAnimInstance.h @@ -6,6 +6,8 @@ #include "Animation/AnimInstance.h" #include "CAnimInstance.generated.h" +class UCharacterMovementComponent; + UCLASS() class CRUNCH_API UCAnimInstance : public UAnimInstance { @@ -45,9 +47,9 @@ public: private: UPROPERTY() - ACharacter* OwnerCharacter; + TObjectPtr OwnerCharacter; UPROPERTY() - class UCharacterMovementComponent* OwnerMovementComp; + TObjectPtr OwnerMovementComp; UPROPERTY() float Speed{0.f}; float YawSpeed{0.f}; diff --git a/Source/Crunch/Public/Character/CCharacter.h b/Source/Crunch/Public/Character/CCharacter.h index d572f94..e1cd758 100644 --- a/Source/Crunch/Public/Character/CCharacter.h +++ b/Source/Crunch/Public/Character/CCharacter.h @@ -27,7 +27,7 @@ public: private: UPROPERTY(EditDefaultsOnly, Category="Gameplay Effects") - UCAbilitySystemComponent* CAbilitySystemComponent; + TObjectPtr CAbilitySystemComponent; UPROPERTY(BlueprintReadOnly, Category="Gameplay Effects", meta=(AllowPrivateAccess=true)) - const UCAttributeSet* CAttributeSet; + TObjectPtr CAttributeSet; }; diff --git a/Source/Crunch/Public/Character/CPlayerCharacter.h b/Source/Crunch/Public/Character/CPlayerCharacter.h index 85f1037..be24398 100644 --- a/Source/Crunch/Public/Character/CPlayerCharacter.h +++ b/Source/Crunch/Public/Character/CPlayerCharacter.h @@ -6,6 +6,10 @@ #include "CCharacter.h" #include "CPlayerCharacter.generated.h" +class UInputAction; +class UInputMappingContext; +class UCameraComponent; +class USpringArmComponent; struct FInputActionValue; UCLASS() @@ -26,21 +30,21 @@ public: private: UPROPERTY(VisibleDefaultsOnly, Category= "View") - class USpringArmComponent* CameraBoom; + TObjectPtr CameraBoom; UPROPERTY(VisibleDefaultsOnly, Category= "View") - class UCameraComponent* ViewCamera; + TObjectPtr ViewCamera; UPROPERTY(EditDefaultsOnly, Category= "View") FRotator RotationRate{FRotator(0.0f, 720.0f, 0.0f)}; UPROPERTY(EditDefaultsOnly, Category= "Input") - class UInputMappingContext* GameplayMappingContext; + TObjectPtr GameplayMappingContext; UPROPERTY(EditDefaultsOnly, Category= "Input") - class UInputAction* JumpInputAction; + TObjectPtr JumpInputAction; UPROPERTY(EditDefaultsOnly, Category= "Input") - UInputAction* LookInputAction; + TObjectPtr LookInputAction; UPROPERTY(EditDefaultsOnly, Category= "Input") - UInputAction* MoveInputAction; + TObjectPtr MoveInputAction; void HandleLookInput(const FInputActionValue& InputActionValue); void HandleMoveInput(const FInputActionValue& InputActionValue); diff --git a/Source/Crunch/Public/Player/CPlayerController.h b/Source/Crunch/Public/Player/CPlayerController.h index 656ca02..9d17b89 100644 --- a/Source/Crunch/Public/Player/CPlayerController.h +++ b/Source/Crunch/Public/Player/CPlayerController.h @@ -1,4 +1,4 @@ -// Multipalyer By Caleb +// Multiplayer By Caleb #pragma once @@ -6,6 +6,8 @@ #include "GameFramework/PlayerController.h" #include "CPlayerController.generated.h" +class ACPlayerCharacter; + UCLASS() class CRUNCH_API ACPlayerController : public APlayerController { @@ -17,5 +19,5 @@ public: private: UPROPERTY() - class ACPlayerCharacter* CPlayerCharacter; + TObjectPtr CPlayerCharacter; }; diff --git a/Source/Crunch/Public/Widgets/ValueGauge.h b/Source/Crunch/Public/Widgets/ValueGauge.h index 2440c5c..5c95475 100644 --- a/Source/Crunch/Public/Widgets/ValueGauge.h +++ b/Source/Crunch/Public/Widgets/ValueGauge.h @@ -23,9 +23,9 @@ private: UPROPERTY(EditAnywhere, Category="Visual") FLinearColor BarColor; UPROPERTY(EditAnywhere, meta=(BindWidget)) - UProgressBar* ProgressBar; + TObjectPtr ProgressBar; UPROPERTY(EditAnywhere, meta=(BindWidget)) - UTextBlock* ValueText; + TObjectPtr ValueText; };