fix return value for struct with custom thunk

getnamo · Dec 5, 2019 · 0c8aa54 · 0c8aa54
1 parent bc9ff98
commit 0c8aa54
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 22 deletions.
diff --git a/GlobalEventSystem.uplugin b/GlobalEventSystem.uplugin
@@ -1,7 +1,7 @@
 {
 	"FileVersion": 3,
 	"Version": 1,
-	"VersionName": "0.3.0",
+	"VersionName": "0.3.1",
 	"FriendlyName": "GlobalEventSystem",
 	"Description": "Loosely coupled internal event system plugin for the unreal engine.",
 	"Category": "Other",

diff --git a/Source/GlobalEventSystem/Private/GlobalEventSystemBPLibrary.cpp b/Source/GlobalEventSystem/Private/GlobalEventSystemBPLibrary.cpp
@@ -214,25 +214,10 @@ bool UGlobalEventSystemBPLibrary::Conv_PropToName(const FGESWildcardProperty& In
 	}
 }
 
-void UGlobalEventSystemBPLibrary::Conv_PropToStruct(const FGESWildcardProperty& InProp, UProperty*& OutStruct)
+bool UGlobalEventSystemBPLibrary::Conv_PropToStruct(const FGESWildcardProperty& InProp, UProperty*& OutStruct)
 {
-	/*if (InProp.Property->IsA<UStructProperty>())
-	{
-		UStructProperty* StructProperty = Cast<UStructProperty>(InProp.Property);
-		//OutStruct = InProp.Property;
-		//StructProperty->Struct->
-		//StructProperty->ContainerPtrToValuePtrForDefaults(StructProperty->Struct);
-		//OutStruct->CopyCompleteValue(StructProperty->Value)
-		//TODO figure out how to copy... wait a minute we can do a custom thunk to get struct ptr! yay...
-		UE_LOG(LogTemp, Warning, TEXT("UStructProperty not supported due to lack of copy operation. TBC"));
-		return false;
-	}
-	else
-	{
-		UE_LOG(LogTemp, Warning, TEXT("UGlobalEventSystemBPLibrary::Conv_PropToStruct %s is not a Struct."), *InProp.Property->GetName());
-		return false;
-	}*/
-	//return false;
+	//doesn't get called due to custom thunk
+	return false;
 }
 
 bool UGlobalEventSystemBPLibrary::HandlePropToStruct(const FGESWildcardProperty& InProp, FGESWildcardProperty& OutProp)

diff --git a/Source/GlobalEventSystem/Public/GlobalEventSystemBPLibrary.h b/Source/GlobalEventSystem/Public/GlobalEventSystemBPLibrary.h
@@ -81,7 +81,7 @@ class UGlobalEventSystemBPLibrary : public UBlueprintFunctionLibrary
 	static bool Conv_PropToName(const FGESWildcardProperty& InProp, FName& OutName);
 
 	UFUNCTION(BlueprintPure, CustomThunk, meta = (DisplayName = "To Struct (Wildcard Property)", CustomStructureParam = "OutStruct", BlueprintAutocast), Category = "Utilities|SocketIO")
-	static void Conv_PropToStruct(const FGESWildcardProperty& InProp, UProperty*& OutStruct);
+	static bool Conv_PropToStruct(const FGESWildcardProperty& InProp, UProperty*& OutStruct);
 
 	UFUNCTION(BlueprintPure, meta = (DisplayName = "To Object (Wildcard Property)", BlueprintAutocast), Category = "Utilities|SocketIO")
 	static bool Conv_PropToObject(const FGESWildcardProperty& InProp, UObject*& OutObject);
@@ -113,7 +113,7 @@ class UGlobalEventSystemBPLibrary : public UBlueprintFunctionLibrary
 
 	DECLARE_FUNCTION(execConv_PropToStruct)
 	{
-		//Stack.MostRecentProperty = nullptr;
+		Stack.MostRecentProperty = nullptr;
 		FGESWildcardProperty InProp;
 		FGESWildcardProperty OutProp;
 
@@ -127,11 +127,14 @@ class UGlobalEventSystemBPLibrary : public UBlueprintFunctionLibrary
 
 		OutProp.Property = ParameterProp;
 		OutProp.PropertyPtr = PropPtr;
+		bool bDidCopy = false;
 
 		P_FINISH;
 		P_NATIVE_BEGIN;
-		bool bDidCopy = HandlePropToStruct(InProp, OutProp);
+		bDidCopy = HandlePropToStruct(InProp, OutProp);	//todo: add return support
 		P_NATIVE_END;
+
+		*(bool*)RESULT_PARAM = bDidCopy;
 	}