Keeper317/open-conflict
2
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Main Rebase #5

Merged
Keeper317 merged 16 commits from main into MenusAndStuffpt2 2026-01-03 06:25:24 +00:00
Conversation 0 Commits 16 Files Changed 12 +16 -1
2 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 7b9a33abfe - Show all commits

11
Source/OpenConflict/PlayerCharacter/DDICharacter.cpp
View File

@@ -102,3 +102,14 @@ bool ADDICharacter::Server_CharacterHit_Validate(UPrimitiveComponent* HitCompone
{ {
return true; return true;
} }
void ADDICharacter::OnRep_Health()
{
GEngine->AddOnScreenDebugMessage(-1, 5.f, FColor::Red, "Health Replicated");
}
void ADDICharacter::GetLifetimeReplicatedProps(TArray<FLifetimeProperty>& OutLifetimeProps) const
{
Super::GetLifetimeReplicatedProps(OutLifetimeProps);
DOREPLIFETIME(ADDICharacter, HealthComponent);
}

6
Source/OpenConflict/PlayerCharacter/DDICharacter.h
View File

@@ -6,6 +6,7 @@
#include "Camera/CameraComponent.h" #include "Camera/CameraComponent.h"
#include "Components/DDIHealth.h" #include "Components/DDIHealth.h"
#include "GameFramework/Character.h" #include "GameFramework/Character.h"
#include "Net/UnrealNetwork.h"
#include "DDICharacter.generated.h" #include "DDICharacter.generated.h"
@@ -28,7 +29,7 @@ public:
/*Properties*/ /*Properties*/
UPROPERTY(EditDefaultsOnly, BlueprintReadOnly, Category = "Camera") UPROPERTY(EditDefaultsOnly, BlueprintReadOnly, Category = "Camera")
UCameraComponent* CameraComponent; UCameraComponent* CameraComponent;
UPROPERTY(EditDefaultsOnly, BlueprintReadOnly, Category = "Health") UPROPERTY(EditDefaultsOnly, BlueprintReadOnly, Category = "Health", ReplicatedUsing=OnRep_Health)
UDDIHealth* HealthComponent; UDDIHealth* HealthComponent;
UPROPERTY(EditDefaultsOnly, BlueprintReadOnly, Category = "Projectile") UPROPERTY(EditDefaultsOnly, BlueprintReadOnly, Category = "Projectile")
@@ -50,6 +51,9 @@ public:
UFUNCTION(Server, Reliable, WithValidation, BlueprintCallable) UFUNCTION(Server, Reliable, WithValidation, BlueprintCallable)
void Server_CharacterHit(UPrimitiveComponent* HitComponent, AActor* OtherActor, UPrimitiveComponent* OtherComp, FVector NormalImpulse, const FHitResult& Hit); void Server_CharacterHit(UPrimitiveComponent* HitComponent, AActor* OtherActor, UPrimitiveComponent* OtherComp, FVector NormalImpulse, const FHitResult& Hit);
UFUNCTION()
void OnRep_Health();
/*C++ only declarations*/ /*C++ only declarations*/
private: private:
/*Properties*/ /*Properties*/