Adjustments to enable multiple bindings mode

lucoiso · Nov 6, 2022 · e3d2e56 · e3d2e56 · lucoiso · Nov 6, 2022
1 parent 7928d17
commit e3d2e56
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/Config/DefaultGame.ini b/Config/DefaultGame.ini
@@ -124,7 +124,7 @@ MetaDataTagsForAssetRegistry=()
 GameFeaturesManagerClassName=/Script/GameFeatures.DefaultGameFeaturesProjectPolicies
 
 [/Script/ModularFeatures_ExtraActions.MFEA_Settings]
-bUseInputEnumeration=True
 bEnableAbilityAutoBinding=False
 InputIDEnumeration=/Game/Main/Data/GAS/EN_AbilityInputID.EN_AbilityInputID
+AbilityBindingMode=InputID
 
diff --git a/Plugins/UEModularFeatures_ExtraActions b/Plugins/UEModularFeatures_ExtraActions
diff --git a/Source/ProjectElementus/Private/Actors/Character/PEPlayerController.cpp b/Source/ProjectElementus/Private/Actors/Character/PEPlayerController.cpp
@@ -167,7 +167,7 @@ void APEPlayerController::ProcessTrade_Internal(const TArray<FElementusItemInfo>
 
 #pragma region IAbilityInputBinding
 // Double "_Implementation" because this function is a RPC call version of a virtual function from IAbilityBinding interface
-void APEPlayerController::SetupAbilityInputBinding_Implementation_Implementation(UInputAction* Action, const int32 InputID)
+void APEPlayerController::SetupAbilityBindingByInput_Implementation_Implementation(UInputAction* Action, const int32 InputID)
 {
 	if (!IsValid(Action))
 	{

diff --git a/Source/ProjectElementus/Public/Actors/Character/PEPlayerController.h b/Source/ProjectElementus/Public/Actors/Character/PEPlayerController.h
@@ -48,7 +48,7 @@ class PROJECTELEMENTUS_API APEPlayerController final : public APlayerController,
 	/* This function came from IAbilityInputBinding interface,
 	 * provided by GameFeatures_ExtraActions plugin to manage ability bindings */
 	UFUNCTION(Client, Reliable)
-	virtual void SetupAbilityInputBinding_Implementation(UInputAction* Action, const int32 InputID = -1) override;
+	virtual void SetupAbilityBindingByInput_Implementation(UInputAction* Action, const int32 InputID) override;
 
 	/* This function came from IAbilityInputBinding interface,
 	 * provided by GameFeatures_ExtraActions plugin to manage ability bindings */
+2 −2		Source/Private/GameFeatureAction_AddAbilities.cpp
+45 −5		Source/Private/GameFeatureAction_AddInputs.cpp
+1 −1		Source/Private/MFEA_Settings.cpp
+40 −2		Source/Private/ModularFeatures_InternalFuncs.h
+20 −2		Source/Public/AbilityInputBinding.h
+5 −5		Source/Public/GameFeatureAction_AddAbilities.h
+3 −3		Source/Public/GameFeatureAction_AddEffects.h
+23 −9		Source/Public/GameFeatureAction_AddInputs.h
+2 −2		Source/Public/GameFeatureAction_SpawnActors.h
+15 −6		Source/Public/MFEA_Settings.h