From b3e72569274cd8c50c59a3fbc6a38a795ad9cc99 Mon Sep 17 00:00:00 2001 From: laurirasanen Date: Sat, 18 Sep 2021 13:38:33 +0300 Subject: [PATCH 1/2] Update server functions for latest tf2 sdk branch --- .../modules/engines/engines_server_wrap.cpp | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/src/core/modules/engines/engines_server_wrap.cpp b/src/core/modules/engines/engines_server_wrap.cpp index a61729f8d..451c74c0b 100644 --- a/src/core/modules/engines/engines_server_wrap.cpp +++ b/src/core/modules/engines/engines_server_wrap.cpp @@ -521,10 +521,12 @@ static void export_engine_server(scope _server) "Tells the engine we can immediately re-use all the edict indices." ) +#if !defined (ENGINE_BRANCH_TF2) .def("is_internal_build", &IVEngineServer::IsInternalBuild, "Returns true if the engine is an internal build." ) +#endif .def("get_change_accessor", &IVEngineServer::GetChangeAccessor, @@ -751,7 +753,9 @@ static void export_engine_server(scope _server) FUNCTION_INFO(GetPrevCheckTransmitInfo) FUNCTION_INFO(GetSharedEdictChangeInfo) FUNCTION_INFO(AllowImmediateEdictReuse) +#if !defined (ENGINE_BRANCH_TF2) FUNCTION_INFO(IsInternalBuild) +#endif FUNCTION_INFO(GetChangeAccessor) FUNCTION_INFO(CleanUpEntityClusterList) FUNCTION_INFO(GetAppID) @@ -885,9 +889,22 @@ static void export_iserver(scope _server) ":rtype: int" ); +#if defined(ENGINE_BRANCH_TF2) + _IServer.add_property( + "public_address", + &IServer::GetPublicAddress, + "Return the currently used public address.\n\n" + ":rtype: NetAdr" // TODO + ); +#endif + _IServer.add_property( "udp_port", +#if defined(ENGINE_BRANCH_TF2) + &IServer::GetLocalUDPPort, +#else &IServer::GetUDPPort, +#endif "Return the currently used UDP port.\n\n" ":rtype: int" ); From 64c744df187cdf58c49454335e7a94b66249c264 Mon Sep 17 00:00:00 2001 From: laurirasanen Date: Mon, 20 Sep 2021 10:22:33 +0300 Subject: [PATCH 2/2] Remove IsInternalBuild and GetPublicAddress from server wrap --- .../modules/engines/engines_server_wrap.cpp | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/src/core/modules/engines/engines_server_wrap.cpp b/src/core/modules/engines/engines_server_wrap.cpp index 451c74c0b..0623789b5 100644 --- a/src/core/modules/engines/engines_server_wrap.cpp +++ b/src/core/modules/engines/engines_server_wrap.cpp @@ -521,13 +521,6 @@ static void export_engine_server(scope _server) "Tells the engine we can immediately re-use all the edict indices." ) -#if !defined (ENGINE_BRANCH_TF2) - .def("is_internal_build", - &IVEngineServer::IsInternalBuild, - "Returns true if the engine is an internal build." - ) -#endif - .def("get_change_accessor", &IVEngineServer::GetChangeAccessor, args("edict"), @@ -753,9 +746,6 @@ static void export_engine_server(scope _server) FUNCTION_INFO(GetPrevCheckTransmitInfo) FUNCTION_INFO(GetSharedEdictChangeInfo) FUNCTION_INFO(AllowImmediateEdictReuse) -#if !defined (ENGINE_BRANCH_TF2) - FUNCTION_INFO(IsInternalBuild) -#endif FUNCTION_INFO(GetChangeAccessor) FUNCTION_INFO(CleanUpEntityClusterList) FUNCTION_INFO(GetAppID) @@ -889,15 +879,6 @@ static void export_iserver(scope _server) ":rtype: int" ); -#if defined(ENGINE_BRANCH_TF2) - _IServer.add_property( - "public_address", - &IServer::GetPublicAddress, - "Return the currently used public address.\n\n" - ":rtype: NetAdr" // TODO - ); -#endif - _IServer.add_property( "udp_port", #if defined(ENGINE_BRANCH_TF2)