OB SDK fixes

Source-Python-Dev-Team · Ayuto · Apr 18, 2025 · Apr 1, 2025 · Apr 1, 2025 · Apr 15, 2025
commit 061c06310cb29604dfb1062e67f35ff934f463d2
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -1,8 +1,8 @@
 # ------------------------------------------------------------------
 # Set minimum required version of CMake
 # ------------------------------------------------------------------
-CMake_Minimum_Required(VERSION 3.0)
-project(Source-Python)
+CMake_Minimum_Required(VERSION 3.15)
+project(source-python)
 
 # ------------------------------------------------------------------
 # Makefile includes.

diff --git a/src/core/modules/engines/engines_server_wrap.cpp b/src/core/modules/engines/engines_server_wrap.cpp
@@ -881,7 +881,7 @@ static void export_iserver(scope _server)
 
 	_IServer.add_property(
 		"udp_port",
-#if defined(ENGINE_BRANCH_TF2) || defined(ENGINE_BRANCH_HL2DM)
+#if defined(ENGINE_ORANGEBOX)
 		&IServer::GetLocalUDPPort,
 #else
 		&IServer::GetUDPPort,

diff --git a/src/core/modules/entities/entities.h b/src/core/modules/entities/entities.h
@@ -102,7 +102,11 @@ class TakeDamageInfoBaseWrapper: public CTakeDamageInfo
 
 	void set_inflictor(unsigned int uiInflictor)
 	{
+#if defined(ENGINE_ORANGEBOX)
+		m_hInflictor = EHANDLE::UnsafeFromIndex(uiInflictor);
+#else
 		m_hInflictor = ExcBaseHandleFromIndex(uiInflictor);
+#endif
 	}
 
 	unsigned int get_attacker()
@@ -144,7 +148,7 @@ class TakeDamageInfoBaseWrapper: public CTakeDamageInfo
 			m_CSGOAttacker.m_iUserId = -1;
 		}
 #else
-		m_hAttacker = ExcBaseHandleFromIndex(uiAttacker);
+		m_hAttacker = EHANDLE::UnsafeFromIndex(uiAttacker);
 #endif
 	}
 
@@ -172,7 +176,11 @@ class TakeDamageInfoBaseWrapper: public CTakeDamageInfo
 
 	void set_weapon(unsigned int uiWeapon)
 	{
+#if defined(ENGINE_ORANGEBOX)
+		m_hWeapon = EHANDLE::UnsafeFromIndex(uiWeapon);
+#else
 		m_hWeapon = ExcBaseHandleFromIndex(uiWeapon);
+#endif
 	}
 
 	void set_base_damage(float flBaseDamage)

diff --git a/src/core/modules/keyvalues/keyvalues_wrap.cpp b/src/core/modules/keyvalues/keyvalues_wrap.cpp
@@ -49,18 +49,31 @@
 	friend void RecursiveCopyKeyValuesHack(KeyValues* pThis, KeyValues& src); 
 	void RecursiveCopyKeyValues( KeyValues& src );
 */
-#define RecursiveCopyKeyValues \
-	JustFinishTheDeclaration() {} \
-	friend void RecursiveCopyKeyValuesHack(KeyValues* pThis, KeyValues& src); \
-	void RecursiveCopyKeyValues
+#if defined(ENGINE_ORANGEBOX)
+	#define CopyKeyValuesFromRecursive \
+		JustFinishTheDeclaration() {} \
+		friend void RecursiveCopyKeyValuesHack(KeyValues* pThis, KeyValues& src); \
+		void CopyKeyValuesFromRecursive
+#else
+	#define RecursiveCopyKeyValues \
+		JustFinishTheDeclaration() {} \
+		friend void RecursiveCopyKeyValuesHack(KeyValues* pThis, KeyValues& src); \
+		void RecursiveCopyKeyValues
+#endif
 
 #include "tier1/KeyValues.h"
 
 // Now, remove the replacement, so the friend function can call the member function.
 #define RecursiveCopyKeyValues RecursiveCopyKeyValues
+#define CopyKeyValuesFromRecursive CopyKeyValuesFromRecursive
+
 void RecursiveCopyKeyValuesHack(KeyValues* pThis, KeyValues& src)
 {
+#if defined(ENGINE_ORANGEBOX)
+	pThis->CopyKeyValuesFromRecursive(src);
+#else
 	pThis->RecursiveCopyKeyValues(src);
+#endif
 }
 
 
@@ -191,7 +204,7 @@ void export_keyvalues(scope _keyvalues)
 
 		.add_property("next_key",
 			make_function(
-				&KeyValues::GetNextKey,
+				GET_CONST_METHOD(const KeyValues*, KeyValues, GetNextKey),
 				reference_existing_object_policy()
 			),
 			&KeyValues::SetNextKey,

diff --git a/src/core/modules/players/players_wrap.cpp b/src/core/modules/players/players_wrap.cpp
@@ -27,6 +27,8 @@
 //-----------------------------------------------------------------------------
 // Includes.
 //-----------------------------------------------------------------------------
+class CBasePlayer;
+
 #include "players_generator.h"
 #include "export_main.h"
 #include "modules/memory/memory_tools.h"

diff --git a/src/core/modules/steam/orangebox/steam_wrap.h b/src/core/modules/steam/orangebox/steam_wrap.h
@@ -35,7 +35,6 @@ void export_engine_specific_steamid(scope _steam, T SteamID)
 template<class T>
 void export_engine_specific_account_type(scope _steam, T AccountType)
 {
-	AccountType.value("P2P_SUPER_SEEDER", k_EAccountTypeP2PSuperSeeder);
 }
 
 #endif // _STEAM_WRAP_ORANGEBOX_H
diff --git a/src/core/sp_hooks.cpp b/src/core/sp_hooks.cpp
@@ -27,6 +27,8 @@
 //---------------------------------------------------------------------------------
 // Includes
 //---------------------------------------------------------------------------------
+class CBasePlayer;
+
 // Boost.Python
 #include "boost/python.hpp"
 using namespace boost::python;

diff --git a/src/core/sp_main.cpp b/src/core/sp_main.cpp
@@ -219,8 +219,8 @@ bool CSourcePython::Load(	CreateInterfaceFn interfaceFactory, CreateInterfaceFn
 	DevMsg(1, MSG_PREFIX "Connecting tier1 libraries...\n");
 	ConnectTier1Libraries( &interfaceFactory, 1 );
 
-	DevMsg(1, MSG_PREFIX "Connecting tier2 libraries...\n");
-	ConnectTier2Libraries( &interfaceFactory, 2 );
+	//DevMsg(1, MSG_PREFIX "Connecting tier2 libraries...\n");
+	//ConnectTier2Libraries( &interfaceFactory, 2 );
 #endif
 
 	// Get all engine interfaces.
@@ -317,8 +317,8 @@ void CSourcePython::Unload( void )
 	DevMsg(1, MSG_PREFIX "Disconnecting interfaces...\n");
 	DisconnectInterfaces();
 #else
-	DevMsg(1, MSG_PREFIX "Disconnecting tier2 libraries...\n");
-	DisconnectTier2Libraries( );
+	//DevMsg(1, MSG_PREFIX "Disconnecting tier2 libraries...\n");
+	//DisconnectTier2Libraries( );
 
 	DevMsg(1, MSG_PREFIX "Disconnecting tier1 libraries...\n");
 	DisconnectTier1Libraries( );
@@ -351,7 +351,7 @@ void CSourcePython::UnPause( void )
 //-----------------------------------------------------------------------------
 const char *CSourcePython::GetPluginDescription( void )
 {
-	return "Source.Python, (C) 2012-2021, Source.Python Team.";
+	return "Source.Python, (C) 2012-2025, Source.Python Team.";
 }
 
 //-----------------------------------------------------------------------------
@@ -507,7 +507,7 @@ void CSourcePython::ClientFullyConnect( edict_t *pEntity )
 }
 #endif
 
-#if defined(ENGINE_CSGO) || defined(ENGINE_BMS) || defined(ENGINE_BLADE)
+#if defined(ENGINE_CSGO) || defined(ENGINE_BMS) || defined(ENGINE_BLADE) || defined(ENGINE_ORANGEBOX)
 void CSourcePython::OnEdictAllocated( edict_t *edict )
 {
 	unsigned int iEntityIndex;

diff --git a/src/core/sp_main.h b/src/core/sp_main.h
@@ -83,7 +83,7 @@ class CSourcePython: public IServerPluginCallbacks, public IEntityListener, publ
 	virtual void			ClientFullyConnect( edict_t *pEntity );
 #endif
 
-#if defined(ENGINE_CSGO) || defined(ENGINE_BMS) || defined(ENGINE_BLADE)
+#if defined(ENGINE_CSGO) || defined(ENGINE_BMS) || defined(ENGINE_BLADE) || defined(ENGINE_ORANGEBOX)
 	virtual void			OnEdictAllocated( edict_t *edict );
 	virtual void			OnEdictFreed( const edict_t *edict );
 #endif

diff --git a/src/loader/loader_main.cpp b/src/loader/loader_main.cpp
@@ -463,7 +463,7 @@ void CSourcePython::ClientFullyConnect( edict_t *pEntity )
 }
 #endif
 
-#if defined(ENGINE_CSGO) || defined(ENGINE_BMS) || defined(ENGINE_BLADE)
+#if defined(ENGINE_CSGO) || defined(ENGINE_BMS) || defined(ENGINE_BLADE) || defined(ENGINE_ORANGEBOX)
 void CSourcePython::OnEdictAllocated( edict_t *edict )
 {
 	if (m_pCorePlugin != NULL)

diff --git a/src/loader/loader_main.h b/src/loader/loader_main.h
@@ -76,7 +76,7 @@ class CSourcePython: public IServerPluginCallbacks
 	virtual void			ClientFullyConnect( edict_t *pEntity );
 #endif
 
-#if defined(ENGINE_CSGO) || defined(ENGINE_BMS) || defined(ENGINE_BLADE)
+#if defined(ENGINE_CSGO) || defined(ENGINE_BMS) || defined(ENGINE_BLADE) || defined(ENGINE_ORANGEBOX)
 	virtual void			OnEdictAllocated( edict_t *edict );
 	virtual void			OnEdictFreed( const edict_t *edict );
 #endif

diff --git a/src/makefiles/win32/win32.base.cmake b/src/makefiles/win32/win32.base.cmake
@@ -37,27 +37,19 @@ Set(CMAKE_CXX_FLAGS_RELEASE "/D_NDEBUG /MD /wd4005 /MP")
 # ------------------------------------------------------------------
 # Statically link runtime libraries for the loader
 # ------------------------------------------------------------------
-# This looks like a bug...
-# For the debug config we need to specify the release flag and vice versa.
-target_compile_options(source-python PRIVATE "/MT$<$<CONFIG:Debug>:d>")
-target_compile_options(source-python PRIVATE "/MTd$<$<CONFIG:Release>:d>")
-target_compile_options(core PRIVATE "/MT$<$<CONFIG:Debug>:d>")
-target_compile_options(core PRIVATE "/MTd$<$<CONFIG:Release>:d>")
+set_property(TARGET core source-python PROPERTY
+  MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
 
-Set_Target_Properties(core PROPERTIES
-    LINK_FLAGS_RELEASE "/NODEFAULTLIB:LIBC.lib /NODEFAULTLIB:LIBCMT.lib /NODEFAULTLIB:LIBCPMT.lib"
-)
+#Set_Target_Properties(core PROPERTIES
+#    LINK_FLAGS_RELEASE "/NODEFAULTLIB:LIBC.lib /NODEFAULTLIB:LIBCMT.lib /NODEFAULTLIB:LIBCPMT.lib"
+#)
+
+SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /SAFESEH:NO")
 
 # ------------------------------------------------------------------
 # Link libraries.
 # ------------------------------------------------------------------
 Set(SOURCEPYTHON_LINK_LIBRARIES
-    ${SOURCESDK_LIB}/public/tier0.lib
-    ${SOURCESDK_LIB}/public/tier1.lib
-    ${SOURCESDK_LIB}/public/tier2.lib
-    ${SOURCESDK_LIB}/public/tier3.lib
-    ${SOURCESDK_LIB}/public/vstdlib.lib
-    ${SOURCESDK_LIB}/public/mathlib.lib
     ${DYNCALLSDK_LIB}/libdyncall_s.lib
     ${DYNCALLSDK_LIB}/libdyncallback_s.lib
     ${DYNCALLSDK_LIB}/libdynload_s.lib
@@ -67,6 +59,26 @@ Set(SOURCEPYTHON_LINK_LIBRARIES
     ${BOOSTSDK_LIB}/libboost_system-vc143-mt-s-x32-1_87.lib
 )
 
+If( SOURCE_ENGINE MATCHES "csgo" OR SOURCE_ENGINE MATCHES "blade")
+    Set(SOURCEPYTHON_LINK_LIBRARIES
+        ${SOURCEPYTHON_LINK_LIBRARIES}
+        ${SOURCESDK_LIB}/public/tier0.lib
+        ${SOURCESDK_LIB}/public/tier1.lib
+        ${SOURCESDK_LIB}/public/tier2.lib
+        ${SOURCESDK_LIB}/public/tier3.lib
+        ${SOURCESDK_LIB}/public/vstdlib.lib
+        ${SOURCESDK_LIB}/public/mathlib.lib
+    )
+Else()
+    Set(SOURCEPYTHON_LINK_LIBRARIES
+        ${SOURCEPYTHON_LINK_LIBRARIES}
+        ${SOURCESDK_LIB}/public/x86/tier0.lib
+        ${SOURCESDK_LIB}/public/x86/tier1.lib
+        ${SOURCESDK_LIB}/public/x86/vstdlib.lib
+        ${SOURCESDK_LIB}/public/x86/mathlib.lib
+    )
+Endif()
+
 # CSGO Engine adds in interfaces.lib
 If( SOURCE_ENGINE MATCHES "csgo" OR SOURCE_ENGINE MATCHES "blade")
     Set(SOURCEPYTHON_LINK_LIBRARIES