diff --git a/Plugins/Cog/Source/CogCommon/Public/CogCommonAllegianceActorInterface.h b/Plugins/Cog/Source/CogCommon/Public/CogCommonAllegianceActorInterface.h index eff5716..2905ed8 100644 --- a/Plugins/Cog/Source/CogCommon/Public/CogCommonAllegianceActorInterface.h +++ b/Plugins/Cog/Source/CogCommon/Public/CogCommonAllegianceActorInterface.h @@ -4,13 +4,15 @@ #include "UObject/Interface.h" #include "CogCommonAllegianceActorInterface.generated.h" +//-------------------------------------------------------------------------------------------------------------------------- +// Match ETeamAttitude in AIModule //-------------------------------------------------------------------------------------------------------------------------- UENUM(BlueprintType) enum class ECogCommonAllegiance : uint8 { Friendly, - Enemy, - Neutral + Neutral, + Enemy }; //-------------------------------------------------------------------------------------------------------------------------- diff --git a/Source/CogSample/CogSampleCharacter.cpp b/Source/CogSample/CogSampleCharacter.cpp index 7331e00..e4705c8 100644 --- a/Source/CogSample/CogSampleCharacter.cpp +++ b/Source/CogSample/CogSampleCharacter.cpp @@ -534,16 +534,8 @@ void ACogSampleCharacter::Look(const FInputActionValue& Value) //-------------------------------------------------------------------------------------------------------------------------- ECogCommonAllegiance ACogSampleCharacter::GetAllegianceWithOtherActor(const AActor* OtherActor) const { - ECogSampleAllegiance Allegiance = UCogSampleFunctionLibrary_Team::GetActorsAllegiance(this, OtherActor); - - switch (Allegiance) - { - case ECogSampleAllegiance::Enemy: return ECogCommonAllegiance::Enemy; - case ECogSampleAllegiance::Friendly: return ECogCommonAllegiance::Friendly; - case ECogSampleAllegiance::Neutral: return ECogCommonAllegiance::Neutral; - } - - return ECogCommonAllegiance::Neutral; + const ECogCommonAllegiance Allegiance = static_cast(UCogSampleFunctionLibrary_Team::GetActorsAllegiance(this, OtherActor)); + return Allegiance; } //--------------------------------------------------------------------------------------------------------------------------