Merge branch 'main' of github.com:thejinchao/turbolink

thejinchao · May 19, 2023 · 5c901ba · 5c901ba
2 parents 2cede61 + 736f778
commit 5c901ba
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/Source/TurboLinkGrpc/Private/TurboLinkGrpcModule.cpp b/Source/TurboLinkGrpc/Private/TurboLinkGrpcModule.cpp
@@ -99,7 +99,11 @@ void FTurboLinkGrpcModule::RegisterAllGrpcMessageScriptStruct()
 		}
 
 		//add message script struct to map
+#if (ENGINE_MAJOR_VERSION==5 && ENGINE_MINOR_VERSION>=1) || ENGINE_MAJOR_VERSION>5
+		UScriptStruct* scriptStruct = FindFirstObject<UScriptStruct>(*grpcMessageName);
+#else
 		UScriptStruct* scriptStruct = FindObject<UScriptStruct>(ANY_PACKAGE, *grpcMessageName, true);
+#endif
 		if (scriptStruct)
 		{
 			FName grpcMessageTagName = FName(*(scriptStruct->GetDisplayNameText().ToString()));

diff --git a/Source/TurboLinkGrpc/Public/TurboLinkGrpcClient.h b/Source/TurboLinkGrpc/Public/TurboLinkGrpcClient.h
@@ -73,6 +73,11 @@ struct FGrpcContextHandle
 	FGrpcContextHandle(const uint32& _Value) { this->Value = _Value; }
 };
 
+FORCEINLINE uint32 GetTypeHash(const FGrpcContextHandle& GrpcContextHandle)
+{
+	return GrpcContextHandle.Value;
+}
+
 DECLARE_DYNAMIC_MULTICAST_DELEGATE_TwoParams(FOnContextStateChange, FGrpcContextHandle, Handle, EGrpcContextState, NewState);
 
 UCLASS(ClassGroup = TurboLink, BlueprintType, Abstract)