Skip to content

Make AModularPlayerState implement IAbilitySystemInterface #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
MostExcellent wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Make AModularPlayerState implement IAbilitySystemInterface #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Source/ModularGameplayAbilities/Private/ModularAbilityPlayerState.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ AModularAbilityPlayerState::AModularAbilityPlayerState(const FObjectInitializer&
{
}

UModularAbilitySystemComponent* AModularAbilityPlayerState::GetAbilitySystemComponent() const
UAbilitySystemComponent* AModularAbilityPlayerState::GetAbilitySystemComponent() const
{
return GetModularAbilitySystemComponent();
return ModularAbilitySystemComponent;
}

void AModularAbilityPlayerState::GetLifetimeReplicatedProps(TArray< FLifetimeProperty > & OutLifetimeProps) const
Expand Down
9 changes: 6 additions & 3 deletions Source/ModularGameplayAbilities/Public/ModularAbilityPlayerState.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,26 @@
#pragma once

#include "AbilitySystemInterface.h"
#include "GameplayTagStack.h"
#include "ModularPlayerState.h"
#include "ActorComponent/ModularAbilitySystemComponent.h"
#include "Player/ModularExperiencePlayerState.h"

#include "ModularAbilityPlayerState.generated.h"

UCLASS(Config = "Game")
class MODULARGAMEPLAYABILITIES_API AModularAbilityPlayerState : public AModularExperiencePlayerState
class MODULARGAMEPLAYABILITIES_API AModularAbilityPlayerState : public AModularExperiencePlayerState, public IAbilitySystemInterface
{
GENERATED_BODY()

public:
AModularAbilityPlayerState(const FObjectInitializer& ObjectInitializer = FObjectInitializer::Get());

//~ Begin IAbilitySystemInterface
virtual UAbilitySystemComponent* GetAbilitySystemComponent() const override;
//~ End IAbilitySystemInterface

UFUNCTION(BlueprintCallable, Category = "Lyra|PlayerState")
UModularAbilitySystemComponent* GetModularAbilitySystemComponent() const { return ModularAbilitySystemComponent; }
virtual UModularAbilitySystemComponent* GetAbilitySystemComponent() const;

// Adds a specified number of stacks to the tag (does nothing if StackCount is below 1).
UFUNCTION(BlueprintCallable, BlueprintAuthorityOnly, Category = "ModularAbility")
Expand Down