diff --git a/Content/Legumix/Player/BP_Play.uasset b/Content/Legumix/Player/BP_Play.uasset index 610b58e..542de20 100644 --- a/Content/Legumix/Player/BP_Play.uasset +++ b/Content/Legumix/Player/BP_Play.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d3c779968ec9b6fa5472493f42c7f86385cacb3c55e9f322959543a4c6cbee7d -size 283731 +oid sha256:bc671ebd77c88ba91852256def97a396662efbc816caff40f18381e2eac44413 +size 286911 diff --git a/Source/LegumeMix/Private/Player/LMPlayer.cpp b/Source/LegumeMix/Private/Player/LMPlayer.cpp index fcdedb0..e611f89 100644 --- a/Source/LegumeMix/Private/Player/LMPlayer.cpp +++ b/Source/LegumeMix/Private/Player/LMPlayer.cpp @@ -9,6 +9,7 @@ #include "Camera/CameraComponent.h" #include "Ammo/LMAmmo.h" #include "Player/LMBulletInfo.h" +#include "Player/LMHealthComponent.h" #include "Player/LMHitBox.h" #include "Weapon/LMWeaponManager.h" @@ -25,6 +26,7 @@ ALMPlayer::ALMPlayer() // ArmsMesh->SetupAttachment(Camera); SpreadStream = FRandomStream(FMath::Rand()); + HealthComponent = CreateDefaultSubobject(TEXT("HealthComponent")); } void ALMPlayer::BeginPlay() @@ -34,6 +36,8 @@ void ALMPlayer::BeginPlay() WeaponManager->WeaponSwitched.AddUniqueDynamic(this, &ALMPlayer::WeaponSwitched); GetCamera()->SetFieldOfView(ULMUserSettings::GetLegumixUserSettings()->FieldOfView); + + } bool ALMPlayer::PickUpAmmo(ALMAmmo* Ammo) diff --git a/Source/LegumeMix/Public/Player/LMPlayer.h b/Source/LegumeMix/Public/Player/LMPlayer.h index 5fbe434..a7bef32 100644 --- a/Source/LegumeMix/Public/Player/LMPlayer.h +++ b/Source/LegumeMix/Public/Player/LMPlayer.h @@ -10,7 +10,7 @@ class UCameraComponent; class ULMWeaponManager; - +class ULMHealthComponent; class ALMAmmo; DECLARE_DYNAMIC_MULTICAST_DELEGATE(FOnRequestUnpauseSignature); @@ -110,6 +110,9 @@ private: UPROPERTY(VisibleAnywhere, BlueprintReadOnly, Category=Legumix, meta = (AllowPrivateAccess = true)) TObjectPtr Camera; + UPROPERTY(VisibleAnywhere, BlueprintReadOnly, Category=Legumix, meta = (AllowPrivateAccess = true)) + TObjectPtr HealthComponent; + private: #if WITH_EDITORONLY_DATA /** If set, bullet debug will be drawn. */