(wip) add gears-of-war style health indicator to character

filfreire · Sep 16, 2023 · 1b88bb4 · 1b88bb4
1 parent e597032
commit 1b88bb4
Show file tree

Hide file tree

Showing 7 changed files with 3 additions and 2 deletions.
diff --git a/Content/Blueprints/PlayerPawn.uasset b/Content/Blueprints/PlayerPawn.uasset
diff --git a/Content/Maps/P_TestMap.umap b/Content/Maps/P_TestMap.umap
diff --git a/Content/UI/M_HealthIndicator.uasset b/Content/UI/M_HealthIndicator.uasset
diff --git a/Content/UI/T_HealthMask.uasset b/Content/UI/T_HealthMask.uasset
diff --git a/Content/UI/WBP_HealthIndicator.uasset b/Content/UI/WBP_HealthIndicator.uasset
diff --git a/Source/CoopGameFleep/Private/SCharacter.cpp b/Source/CoopGameFleep/Private/SCharacter.cpp
@@ -106,7 +106,7 @@ void ASCharacter::StopFire()
 }
 
 
-void ASCharacter::OnHealthChanged(USHealthComponent* HealthComp1, float Health, float HealthDelta, const class UDamageType* DamageType, 
+void ASCharacter::OnHealthChanged(USHealthComponent* OwningHealthComp, float Health, float HealthDelta, const class UDamageType* DamageType,
 	class AController* InstigatedBy, AActor* DamageCauser)
 {
 	if (Health <= 0.0f && !bDied)

diff --git a/Source/CoopGameFleep/Public/SCharacter.h b/Source/CoopGameFleep/Public/SCharacter.h
@@ -39,6 +39,7 @@ class COOPGAMEFLEEP_API ASCharacter : public ACharacter
 	UPROPERTY(VisibleAnywhere, BlueprintReadOnly, Category = "Components")
 	USpringArmComponent* SpringArmComp;
 
+	UPROPERTY(VisibleAnywhere, BlueprintReadOnly, Category = "Components")
 	USHealthComponent* HealthComp;
 
 	bool bWantsToZoom;
@@ -72,7 +73,7 @@ class COOPGAMEFLEEP_API ASCharacter : public ACharacter
 	int RifleAmmo;
 
 	UFUNCTION()
-	void OnHealthChanged(USHealthComponent* HealthComp, float Health, float HealthDelta, const class UDamageType* DamageType, class AController* InstigatedBy, AActor* DamageCauser);
+	void OnHealthChanged(USHealthComponent* OwningHealthComp, float Health, float HealthDelta, const class UDamageType* DamageType, class AController* InstigatedBy, AActor* DamageCauser);
 
 	/* Pawn Died previously */
 	UPROPERTY(BlueprintReadOnly, Category = "Player")