Skip to content

Commit 7099efa

Browse files
author
WinterPu
committed
bugfix: callback func cannot have return value because of addDynamic
1 parent c593ded commit 7099efa

File tree

2 files changed

+13
-5
lines changed

2 files changed

+13
-5
lines changed

templates/bpplugin/bp_callback_impl.mustache

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,9 @@ void {{{user_data.bpNodeName}}}::AddBlueprintCallbackExecutor({{{user_data.bpNod
66
return;
77
}
88
{{#methods}}
9+
{{^user_data.hasReturnVal}}
910
{{user_data.bpCallbackDelegateVarName}}.AddDynamic(Executor, &{{parent.user_data.bpNodeName}}CBExecutor::{{user_data.bpNodeName}});
11+
{{/user_data.hasReturnVal}}
1012
{{/methods}}
1113

1214
}
@@ -15,7 +17,9 @@ void {{{user_data.bpNodeName}}}::AddBlueprintCallbackExecutor({{{user_data.bpNod
1517
void {{{user_data.bpNodeName}}}::RemoveAllBlueprintCallbackExecutors(){
1618
1719
{{#methods}}
20+
{{^user_data.hasReturnVal}}
1821
{{user_data.bpCallbackDelegateVarName}}.Clear();
22+
{{/user_data.hasReturnVal}}
1923
{{/methods}}
2024

2125
}
@@ -64,15 +68,14 @@ void {{{user_data.bpNodeName}}}::RemoveAllBlueprintCallbackExecutors(){
6468

6569

6670
{{#methods}}
71+
{{^user_data.hasReturnVal}}
6772
{{{user_data.bpReturnType}}} {{parent.user_data.bpNodeName}}CBExecutor::{{user_data.bpNodeName}}({{#parameters}}{{{user_data.bpParameterType}}} {{name}}{{^user_data.isLast}}, {{/user_data.isLast}}{{/parameters}})
6873
{
6974
7075
UE_LOG(LogAgora, Warning, TEXT("%s"), *FString(AG_FUNCTION_MACRO));
71-
72-
{{#user_data.hasReturnVal}}
73-
return {{{user_data.failureReturnVal}}};
74-
{{/user_data.hasReturnVal}}
76+
7577
}
7678

79+
{{/user_data.hasReturnVal}}
7780
{{/methods}}
7881

templates/type/callback.mustache

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,11 @@ class AGORAPLUGIN_API {{user_data.bpNodeName}}CBExecutor : public UObject {
77
public:
88
99
{{#methods}}
10+
{{^user_data.hasReturnVal}}
1011
{{{user_data.commentCppStyle}}}
1112
UFUNCTION(BlueprintNativeEvent, Category = "Agora|Event")
1213
{{user_data.bpReturnType}} {{user_data.bpNodeName}}({{#parameters}}{{{user_data.bpParameterType}}} {{name}}{{^user_data.isLast}}, {{/user_data.isLast}}{{/parameters}});
13-
14+
{{/user_data.hasReturnVal}}
1415
{{/methods}}
1516
};
1617

@@ -26,15 +27,19 @@ public:
2627
2728
2829
{{#methods}}
30+
{{^user_data.hasReturnVal}}
2931
{{user_data.bpCallbackDelegateMacroName}}({{user_data.bpCallbackDelegateTypeName}}{{#user_data.bpCallbackIsNoParam}}{{/user_data.bpCallbackIsNoParam}}{{^user_data.bpCallbackIsNoParam}}, {{/user_data.bpCallbackIsNoParam}}{{#parameters}}{{{user_data.bpDelegateType}}}, {{name}}{{^user_data.isLast}}, {{/user_data.isLast}}{{/parameters}});
32+
{{/user_data.hasReturnVal}}
3033
{{/methods}}
3134

3235

3336
public:
3437
{{#methods}}
38+
{{^user_data.hasReturnVal}}
3539
{{{user_data.commentCppStyle}}}
3640
UPROPERTY(BlueprintAssignable, Category = "Agora|Event")
3741
{{user_data.bpCallbackDelegateTypeName}} {{user_data.bpCallbackDelegateVarName}};
42+
{{/user_data.hasReturnVal}}
3843
{{/methods}}
3944

4045
{{#methods}}

0 commit comments

Comments
 (0)