ed/Cog
1
0
Fork 0
mirror of https://github.com/Ed94/Cog.git synced 2026-08-04 06:38:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

CogCommon

Browse Source 
Reorder ECogCommonAllegiance  to match ETeamAttitude in AIModule
This commit is contained in:
Arnaud Jamin
2024-01-12 09:33:39 -05:00
parent e8fb710632
commit c6fa1e1a1d
2 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Plugins/Cog/Source/CogCommon/Public/CogCommonAllegianceActorInterface.h
+4 -2
View File
@@ -4,13 +4,15 @@
#include "UObject/Interface.h" #include "UObject/Interface.h"
#include "CogCommonAllegianceActorInterface.generated.h" #include "CogCommonAllegianceActorInterface.generated.h"
//--------------------------------------------------------------------------------------------------------------------------
// Match ETeamAttitude in AIModule
//-------------------------------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------------------------------
UENUM(BlueprintType) UENUM(BlueprintType)
enum class ECogCommonAllegiance : uint8 enum class ECogCommonAllegiance : uint8
{ {
Friendly, Friendly,
Enemy, Neutral,
Neutral Enemy
}; };
//-------------------------------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------------------------------
Source/CogSample/CogSampleCharacter.cpp
+2 -10
View File
@@ -534,16 +534,8 @@ void ACogSampleCharacter::Look(const FInputActionValue& Value)
//-------------------------------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------------------------------
ECogCommonAllegiance ACogSampleCharacter::GetAllegianceWithOtherActor(const AActor* OtherActor) const ECogCommonAllegiance ACogSampleCharacter::GetAllegianceWithOtherActor(const AActor* OtherActor) const
{ {
ECogSampleAllegiance Allegiance = UCogSampleFunctionLibrary_Team::GetActorsAllegiance(this, OtherActor); const ECogCommonAllegiance Allegiance = static_cast<ECogCommonAllegiance>(UCogSampleFunctionLibrary_Team::GetActorsAllegiance(this, OtherActor));
return Allegiance;
switch (Allegiance)
{
case ECogSampleAllegiance::Enemy: return ECogCommonAllegiance::Enemy;
case ECogSampleAllegiance::Friendly: return ECogCommonAllegiance::Friendly;
case ECogSampleAllegiance::Neutral: return ECogCommonAllegiance::Neutral;
}
return ECogCommonAllegiance::Neutral;
} }
//-------------------------------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------------------------------