Fix other Linux issues (2)

untrustedmodders · Sep 1, 2024 · d70a659 · d70a659
1 parent 45ac1d8
commit d70a659
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 20 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -15,6 +15,7 @@ include("cmake/shared.cmake")
 file(GLOB_RECURSE SOURCE_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "src/*.cpp")
 
 set(SOURCE_FILES ${SOURCE_FILES}
+        ${SOURCESDK_DIR}/interfaces/interfaces.cpp
         ${SOURCESDK_DIR}/tier1/convar.cpp
         ${SOURCESDK_DIR}/tier1/generichash.cpp
         #${SOURCESDK_DIR}/tier1/keyvalues3.cpp

diff --git a/cmake/linux.cmake b/cmake/linux.cmake
@@ -55,8 +55,8 @@ set_compile_options(libprotobuf)
 
 set(CS2SDK_LINK_LIBRARIES
         ${SOURCESDK_LIB}/linux64/libtier0.so
-        ${SOURCESDK_LIB}/linux64/tier1.a
-        ${SOURCESDK_LIB}/linux64/interfaces.a
+        #${SOURCESDK_LIB}/linux64/tier1.a
+        #${SOURCESDK_LIB}/linux64/interfaces.a
         #${SOURCESDK_LIB}/linux64/mathlib.a
         #${SOURCESDK_LIB}/linux64/release/libprotobuf.a
         protobuf::libprotobuf

diff --git a/cmake/windows.cmake b/cmake/windows.cmake
@@ -33,8 +33,8 @@ set_compile_options(libprotobuf)
 
 set(CS2SDK_LINK_LIBRARIES
         ${SOURCESDK_LIB}/public/win64/tier0.lib
-        ${SOURCESDK_LIB}/public/win64/tier1.lib
-        ${SOURCESDK_LIB}/public/win64/interfaces.lib
+        #${SOURCESDK_LIB}/public/win64/tier1.lib
+        #${SOURCESDK_LIB}/public/win64/interfaces.lib
         #${SOURCESDK_LIB}/public/win64/mathlib.lib
         #${SOURCESDK_LIB}/public/win64/2015/libprotobuf.lib
         protobuf::libprotobuf

diff --git a/external/hl2sdk-cs2 b/external/hl2sdk-cs2
diff --git a/src/core/player_manager.cpp b/src/core/player_manager.cpp
@@ -270,12 +270,12 @@ void CPlayerManager::OnClientPutInServer(CPlayerSlot slot, char const* pszName,
 	{
 		pPlayer->m_bFakeClient = true;
 
-		CBufferStringGrowable<255> buffer;
+		/*CBufferStringGrowable<255> buffer;
 		if (!OnClientConnect(slot, pszName, 0, "127.0.0.1", false, &buffer))
 		{
 			pPlayer->Kick();
 			return;
-		}
+		}*/
 
 		GetOnClientConnect_PostListenerManager().Notify(pPlayer->m_iSlot.Get());
 	}

diff --git a/src/core/plugin.cpp b/src/core/plugin.cpp
@@ -71,15 +71,15 @@ void Source2SDK::OnPluginStart()
 	using enum dyno::CallbackType;
 	g_HookManager.AddHookMemFunc(&IMetamodListener::OnLevelInit, g_pMetamodListener, Hook_OnLevelInit, Post);
 	g_HookManager.AddHookMemFunc(&IMetamodListener::OnLevelShutdown, g_pMetamodListener, Hook_OnLevelShutdown, Post);
-	//g_HookManager.AddHookMemFunc(&IServerGameDLL::GameFrame, g_pSource2Server, Hook_GameFrame, Post);
-	g_HookManager.AddHookMemFunc(&IServerGameClients::ClientActive, g_pSource2GameClients, Hook_ClientActive, Post);
-	g_HookManager.AddHookMemFunc(&IServerGameClients::ClientDisconnect, g_pSource2GameClients, Hook_ClientDisconnect, Pre, Post);
-	g_HookManager.AddHookMemFunc(&IServerGameClients::ClientPutInServer, g_pSource2GameClients, Hook_ClientPutInServer, Post);
-	g_HookManager.AddHookMemFunc(&IServerGameClients::ClientSettingsChanged, g_pSource2GameClients, Hook_ClientSettingsChanged, Post);
-	g_HookManager.AddHookMemFunc(&IServerGameClients::OnClientConnected, g_pSource2GameClients, Hook_OnClientConnected, Post);
-	g_HookManager.AddHookMemFunc(&IServerGameClients::ClientFullyConnect, g_pSource2GameClients, Hook_ClientFullyConnect, Post);
-	g_HookManager.AddHookMemFunc(&IServerGameClients::ClientConnect, g_pSource2GameClients, Hook_ClientConnect, Pre, Post);
-	g_HookManager.AddHookMemFunc(&IServerGameClients::ClientCommand, g_pSource2GameClients, Hook_ClientCommand, Pre);
+	g_HookManager.AddHookMemFunc(&IServerGameDLL::GameFrame, g_pSource2Server, Hook_GameFrame, Post);
+	//g_HookManager.AddHookMemFunc(&IServerGameClients::ClientActive, g_pSource2GameClients, Hook_ClientActive, Post);
+	//g_HookManager.AddHookMemFunc(&IServerGameClients::ClientDisconnect, g_pSource2GameClients, Hook_ClientDisconnect, Pre, Post);
+	//g_HookManager.AddHookMemFunc(&IServerGameClients::ClientPutInServer, g_pSource2GameClients, Hook_ClientPutInServer, Post);
+	//g_HookManager.AddHookMemFunc(&IServerGameClients::ClientSettingsChanged, g_pSource2GameClients, Hook_ClientSettingsChanged, Post);
+	//g_HookManager.AddHookMemFunc(&IServerGameClients::OnClientConnected, g_pSource2GameClients, Hook_OnClientConnected, Post);
+	//g_HookManager.AddHookMemFunc(&IServerGameClients::ClientFullyConnect, g_pSource2GameClients, Hook_ClientFullyConnect, Post);
+	//g_HookManager.AddHookMemFunc(&IServerGameClients::ClientConnect, g_pSource2GameClients, Hook_ClientConnect, Pre, Post);
+	//g_HookManager.AddHookMemFunc(&IServerGameClients::ClientCommand, g_pSource2GameClients, Hook_ClientCommand, Pre);
 	g_HookManager.AddHookMemFunc(&INetworkServerService::StartupServer, g_pNetworkServerService, Hook_StartupServer, Post);
 	//g_HookManager.AddHookMemFunc(&ISource2GameEntities::CheckTransmit, g_pSource2GameEntities, Hook_CheckTransmit, Post);
 	//using PostEventAbstract = void (IGameEventSystem::*)(CSplitScreenSlot nSlot, bool bLocalOnly, int nClientCount, const uint64* clients, INetworkSerializable* pEvent, const void* pData, unsigned long nSize, NetChannelBufType_t bufType);
@@ -98,11 +98,11 @@ void Source2SDK::OnPluginStart()
 	using GameEventManagerInit = void (*)(IGameEventManager2*);
 	g_HookManager.AddHookDetourFunc<GameEventManagerInit>("CGameEventManager_Init", Hook_GameEventManagerInit, Pre);
 
-	using FireOutputInternal = void (*)(CEntityIOOutput* const, CEntityInstance*, CEntityInstance*, const CVariant* const, float);
-	g_HookManager.AddHookDetourFunc<FireOutputInternal>("CEntityIOOutput_FireOutputInternal", Hook_FireOutputInternal, Pre);
+	//using FireOutputInternal = void (*)(CEntityIOOutput* const, CEntityInstance*, CEntityInstance*, const CVariant* const, float);
+	//g_HookManager.AddHookDetourFunc<FireOutputInternal>("CEntityIOOutput_FireOutputInternal", Hook_FireOutputInternal, Pre);
 
-	using SayText2Filter = void (*)(IRecipientFilter &, CCSPlayerController *, uint64_t, const char *, const char *, const char *, const char *, const char *);
-	g_HookManager.AddHookDetourFunc<SayText2Filter>("UTIL_SayText2Filter", Hook_SayText2Filter, Pre);
+	//using SayText2Filter = void (*)(IRecipientFilter &, CCSPlayerController *, uint64_t, const char *, const char *, const char *, const char *, const char *);
+	//g_HookManager.AddHookDetourFunc<SayText2Filter>("UTIL_SayText2Filter", Hook_SayText2Filter, Pre);
 
 	OnServerStartup(); // for late load
 }