Some refactoring

Author: PierceProvias

Content/AnimalVarietyPack/Pig/Animations/ANIM_Pig_Walk.uasset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:11b1e15d9628c9c5a5c2569e422271276c97b35596e13c87f2d4dc4f589bb3b6
-size 116023
+oid sha256:f5a9eb090f61f4213ffb3adcf7a7239d0294d25c085b3c184afff1debd333c31
+size 58334

Content/Blueprints/Pawns/BP_Bird.uasset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:133fcc0cddf996bbde2a5abc30908a4fe7ba14de2de797b34cba0bedd8801f55
-size 34223
+oid sha256:9fc9d144be505cb6228010d9b2349ab68d3550b5251045f8c2d6529324d421ca
+size 34263

Content/Maps/TestMap.umap

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0f3618dd021d5828076e558c42ba21cfd49b9cf9bc38fda3a24b2b8826142179
-size 139946
+oid sha256:fbe7b7b97cbe767d84ebfc3ee695b910ecb3518d7d78363d0865fdf6f901db5a
+size 137035

Source/ProjectSlash/Breakables/BreakableActor.h

@@ -29,14 +29,14 @@ class PROJECTSLASH_API ABreakableActor : public AActor, public IHitInterface
 private:
 
 	UPROPERTY(VisibleAnywhere, BlueprintReadWrite, meta = (AllowPrivateAccess = "true"))
-	UGeometryCollectionComponent* GeometryCollection = nullptr;
+	TObjectPtr<UGeometryCollectionComponent> GeometryCollection;
 
 	// this is needed for the `SpawnActor` method in World. We need to specify a class for the template function (in particular a BP class and not a c++ one)... In order to do this we can use the UClass and specify it in BP_BreakableActor
 	// Below we use `TSubclassOf` wrapper to specify which class we want! This restricts it to ATreasure class or anything derived from it! More effective than UClass*
 	UPROPERTY(EditAnywhere)
 	TSubclassOf<ATreasure> TreasureClass;  
 
 	UPROPERTY(VisibleAnywhere, BlueprintReadWrite, meta = (AllowPrivateAccess = "true"))
-	UCapsuleComponent* Capsule = nullptr;
+	TObjectPtr<UCapsuleComponent> Capsule;
 
 };

Source/ProjectSlash/Characters/BaseCharacter.h

@@ -35,18 +35,18 @@ class PROJECTSLASH_API ABaseCharacter : public ACharacter, public IHitInterface
 	virtual void GetHit(const FVector& ImpactPoint, AActor* Hitter) override;
 
 	UPROPERTY(VisibleAnywhere, Category = "Weapon")
-	AWeapon* EquippedWeapon = nullptr;
+	TObjectPtr<AWeapon> EquippedWeapon;
 
 	UPROPERTY(VisibleAnywhere, Category = "Weapon")
-	ATwoWeapons* TwoWeapons = nullptr;
+	TObjectPtr<ATwoWeapons> TwoWeapons;
 
 
 	virtual void Attack();
 
 	virtual void Die();
 
 	UPROPERTY(VisibleAnywhere)
-	UAttributeComponent* Attribute = nullptr;
+	TObjectPtr<UAttributeComponent> Attribute;
 
 	/**
 	* Play Montage Functions
@@ -74,7 +74,7 @@ class PROJECTSLASH_API ABaseCharacter : public ACharacter, public IHitInterface
 	void StopAttackMontage();
 
 	UPROPERTY(BlueprintReadOnly, Category = "Combat")
-	AActor* CombatTarget = nullptr;
+	TObjectPtr<AActor> CombatTarget;
 
 	UPROPERTY(EditAnywhere, Category = "Combat")
 	double WarpTargetDistance = 75.f;
@@ -92,16 +92,16 @@ class PROJECTSLASH_API ABaseCharacter : public ACharacter, public IHitInterface
 
 	/** Animation Montages */
 	UPROPERTY(EditDefaultsOnly, Category = "Montages")
-	UAnimMontage* AttackMontage = nullptr;
+	TObjectPtr<UAnimMontage> AttackMontage;
 
 	UPROPERTY(EditDefaultsOnly, Category = "Montages")
-	UAnimMontage* HitReactMontage = nullptr;
+	TObjectPtr<UAnimMontage> HitReactMontage;
 
 	UPROPERTY(EditDefaultsOnly, Category = "Montages")
-	UAnimMontage* DeathMontage = nullptr;
+	TObjectPtr<UAnimMontage> DeathMontage;
 
 	UPROPERTY(EditDefaultsOnly, Category = "Montages")
-	UAnimMontage* DodgeMontage = nullptr;
+	TObjectPtr<UAnimMontage> DodgeMontage;
 
 	UPROPERTY(EditAnywhere, Category = "Montages")
 	TArray<FName> AttackMontageSections;

Source/ProjectSlash/Characters/SlashAnimInstance.h

@@ -24,7 +24,7 @@ class PROJECTSLASH_API USlashAnimInstance : public UAnimInstance
 	ASlashCharacter* Character = nullptr;
 
 	UPROPERTY(BlueprintReadOnly, Category = "Movement")
-	UCharacterMovementComponent* CharacterMovement = nullptr;
+	TObjectPtr<UCharacterMovementComponent> CharacterMovement;
 
 	UPROPERTY(BlueprintReadOnly, Category = "Movement")
 	float GroundSpeed;

Source/ProjectSlash/Characters/SlashCharacter.h

@@ -94,53 +94,53 @@ class PROJECTSLASH_API ASlashCharacter : public ABaseCharacter
 	EActionState ActionState = EActionState::EAS_Unoccupied;
 
 	UPROPERTY(VisibleAnywhere)
-	UCameraComponent* Camera = nullptr;
+	TObjectPtr<UCameraComponent> Camera;
 
 	UPROPERTY(VisibleAnywhere)
-	USpringArmComponent* CameraBoom = nullptr;
+	TObjectPtr<USpringArmComponent> CameraBoom;
 
 	UPROPERTY(VisibleAnywhere, Category = "Hair")
-	UGroomComponent* Hair = nullptr;
+	TObjectPtr<UGroomComponent> Hair;
 
 	UPROPERTY(VisibleAnywhere, Category = "Hair")
-	UGroomComponent* Eyebrows = nullptr;
+	TObjectPtr<UGroomComponent> Eyebrows;
 
 	UPROPERTY(EditAnywhere, Category = "Input")
-	UInputMappingContext* EchoMappingContext = nullptr;
+	TObjectPtr<UInputMappingContext> EchoMappingContext;
 
 	UPROPERTY(EditAnywhere, Category = "Input")
-	UInputAction* MoveAction = nullptr;
+	TObjectPtr<UInputAction> MoveAction;
 
 	UPROPERTY(EditAnywhere, Category = "Input")
-	UInputAction* LookAction = nullptr;
+	TObjectPtr<UInputAction> LookAction;
 
 	UPROPERTY(EditAnywhere, Category = "Input")
-	UInputAction* JumpAction = nullptr;
+	TObjectPtr<UInputAction> JumpAction;
 
 	UPROPERTY(EditAnywhere, Category = "Input")
-	UInputAction* EKeyAction = nullptr;
+	TObjectPtr<UInputAction> EKeyAction;
 
 	UPROPERTY(EditAnywhere, Category = "Input")
-	UInputAction* AttackAction = nullptr;
+	TObjectPtr<UInputAction> AttackAction;
 
 	UPROPERTY(EditAnywhere, Category = "Input")
-	UInputAction* TauntAction = nullptr;
+	TObjectPtr<UInputAction> TauntAction;
 
 	UPROPERTY(EditAnywhere, Category = "Input")
-	UInputAction* KickAction = nullptr;
-
+	TObjectPtr<UInputAction> KickAction;
+	
 	UPROPERTY(EditAnywhere, Category = "Input")
-	UInputAction* DodgeAction = nullptr;
+	TObjectPtr<UInputAction> DodgeAction;
 
 	UPROPERTY(VisibleInstanceOnly)
-	AItem* OverlappingItem = nullptr;
+	TObjectPtr<AItem> OverlappingItem;
 
 	UPROPERTY(EditDefaultsOnly, Category = "Montages")
-	UAnimMontage* TauntMontage = nullptr;
+	TObjectPtr<UAnimMontage> TauntMontage;
 
 	UPROPERTY(EditDefaultsOnly, Category = "Montages")
-	UAnimMontage* EquipMontage = nullptr;
+	TObjectPtr<UAnimMontage> EquipMontage;
 
-	UPlayerOverlay* PlayerOverlay = nullptr;
+	TObjectPtr<UPlayerOverlay> PlayerOverlay;
 
 };

Source/ProjectSlash/Enemies/Enemy.h

@@ -87,7 +87,7 @@ class PROJECTSLASH_API AEnemy : public ABaseCharacter
 
 	// Current patrol target
 	UPROPERTY(EditInstanceOnly, Category = "AI Navigation")
-	AActor* PatrolTarget = nullptr;
+	TObjectPtr<AActor> PatrolTarget;
 
 	// List of patrol destination points
 	UPROPERTY(EditInstanceOnly, Category = "AI Navigation")

Source/ProjectSlash/HUD/HealthBar.h

@@ -16,6 +16,6 @@ class PROJECTSLASH_API UHealthBar : public UUserWidget
 public:
 
 	UPROPERTY(meta = (BindWidget))     // Will link to the health bar in WBP_HealthBar NOTE: Name must match or link will not work
-	UProgressBar* HealthBar = nullptr;
+	TObjectPtr<UProgressBar> HealthBar;
 
 };

Source/ProjectSlash/HUD/HealthBarComponent.h

@@ -19,6 +19,6 @@ class PROJECTSLASH_API UHealthBarComponent : public UWidgetComponent
 private:
 
 	UPROPERTY()
-	UHealthBar* HealthBarWidget = nullptr;
+	TObjectPtr<UHealthBar> HealthBarWidget;
 
 };

Source/ProjectSlash/HUD/PlayerHUD.h

@@ -17,7 +17,7 @@ class PROJECTSLASH_API APlayerHUD : public AHUD
 
 	UPROPERTY(EditDefaultsOnly, Category = "PlayerHUD")
 	TSubclassOf<UPlayerOverlay> PlayerOverlayClass;
-	UPlayerOverlay* PlayerOverlay = nullptr;
+	TObjectPtr<UPlayerOverlay> PlayerOverlay;
 
 protected:
 

Source/ProjectSlash/HUD/PlayerOverlay.h

@@ -24,14 +24,14 @@ class PROJECTSLASH_API UPlayerOverlay : public UUserWidget
 private:
 
 	UPROPERTY(meta = (BindWidget))
-	UProgressBar* HealthProgressBar = nullptr;
+	TObjectPtr<UProgressBar> HealthProgressBar;
 
 	UPROPERTY(meta = (BindWidget))
-	UProgressBar* StaminaProgressBar = nullptr;
+	TObjectPtr<UProgressBar> StaminaProgressBar;
 
 	UPROPERTY(meta = (BindWidget))
-	UTextBlock* GoldCount = nullptr;
+	TObjectPtr<UTextBlock> GoldCount;
 
 	UPROPERTY(meta = (BindWidget))
-	UTextBlock* SoulsCount = nullptr;
+	TObjectPtr<UTextBlock> SoulsCount;
 };

Source/ProjectSlash/Pickups/Item.h

@@ -42,12 +42,12 @@ class PROJECTSLASH_API AItem : public AActor
 	virtual void OnSphereEndOverlap(UPrimitiveComponent* OverlappedComponent, AActor* OtherActor, UPrimitiveComponent* OtherComp, int32 OtherBodyIndex);
 
 	UPROPERTY(VisibleInstanceOnly, BlueprintReadOnly, Category = "Mesh")
-	UStaticMeshComponent* Mesh = nullptr;
+	TObjectPtr<UStaticMeshComponent> Mesh;
 
 	EItemState ItemState = EItemState::EIS_Hovering;
 
 	UPROPERTY(VisibleInstanceOnly, Category = "Collision")
-	USphereComponent* SphereCollider = nullptr;
+	TObjectPtr<USphereComponent> SphereCollider;
 
 private:
 

Source/ProjectSlash/Pickups/Treasure.h

@@ -18,5 +18,5 @@ class PROJECTSLASH_API ATreasure : public AItem
 private:
 
 	UPROPERTY(EditAnywhere, Category = "Sounds")
-	USoundBase* PickupSound = nullptr;
+	TObjectPtr<USoundBase> PickupSound;
 };

Source/ProjectSlash/Pickups/Weapons/TwoWeapons.h

@@ -32,23 +32,23 @@ class PROJECTSLASH_API ATwoWeapons : public AItem
 private:
 
 	UPROPERTY(VisibleInstanceOnly, Category = "Second Mesh")
-	UStaticMeshComponent* SecondMesh = nullptr;
+	TObjectPtr<UStaticMeshComponent> SecondMesh;
 
 	UPROPERTY(VisibleAnywhere, Category = "Weapon Properties")
-	UBoxComponent* RightWeaponBox = nullptr;
+	TObjectPtr<UBoxComponent> RightWeaponBox;
 
 	UPROPERTY(VisibleAnywhere)  // Typically "VisibleAnywhere" is used for USceneComponents whereas variables will have "EditAnywhere"
-	USceneComponent* RightBoxTraceStart = nullptr;
+	TObjectPtr<USceneComponent> RightBoxTraceStart;
 
 	UPROPERTY(VisibleAnywhere)
-	USceneComponent* RightBoxTraceEnd = nullptr;
+	TObjectPtr<USceneComponent> RightBoxTraceEnd;
 
 	UPROPERTY(VisibleAnywhere, Category = "Weapon Properties")
-	UBoxComponent* LeftWeaponBox = nullptr;
+	TObjectPtr<UBoxComponent> LeftWeaponBox;
 
 	UPROPERTY(VisibleAnywhere) 
-	USceneComponent* LeftBoxTraceStart = nullptr;
+	TObjectPtr<USceneComponent> LeftBoxTraceStart;
 
 	UPROPERTY(VisibleAnywhere)
-	USceneComponent* LeftBoxTraceEnd = nullptr;
+	TObjectPtr<USceneComponent> LeftBoxTraceEnd;
 };