Fix HookEntityOutput/HookSingleEntityOutput bugs in sdktools.

core/PlayerManager.cpp

@@ -30,7 +30,6 @@
  */
 
 #include "PlayerManager.h"
-#include "sourcemod.h"
 #include "IAdminSystem.h"
 #include "ConCmdManager.h"
 #include "MenuStyle_Valve.h"
@@ -93,12 +92,6 @@ SH_DECL_EXTERN1_void(ConCommand, Dispatch, SH_NOATTRIB, false, const CCommand &)
 #else
 SH_DECL_EXTERN0_void(ConCommand, Dispatch, SH_NOATTRIB, false);
 #endif
-SH_DECL_HOOK2_void(IVEngineServer, ClientPrintf, SH_NOATTRIB, 0, edict_t *, const char *);
-
-static void PrintfBuffer_FrameAction(void *data)
-{
-	g_Players.OnPrintfFrameAction(reinterpret_cast<unsigned int>(data));
-}
 
 ConCommand *maxplayersCmd = NULL;
 
@@ -179,7 +172,6 @@ void PlayerManager::OnSourceModAllInitialized()
 #elif SOURCE_ENGINE > SE_EYE // 2013/orangebox, but not original orangebox.
 	SH_ADD_HOOK(IServerGameDLL, SetServerHibernation, gamedll, SH_MEMBER(this, &PlayerManager::OnServerHibernationUpdate), true);
 #endif
-	SH_ADD_HOOK(IVEngineServer, ClientPrintf, engine, SH_MEMBER(this, &PlayerManager::OnClientPrintf), false);
 
 	sharesys->AddInterface(NULL, this);
 
@@ -233,7 +225,6 @@ void PlayerManager::OnSourceModShutdown()
 #elif SOURCE_ENGINE > SE_EYE // 2013/orangebox, but not original orangebox.
 	SH_REMOVE_HOOK(IServerGameDLL, SetServerHibernation, gamedll, SH_MEMBER(this, &PlayerManager::OnServerHibernationUpdate), true);
 #endif
-	SH_REMOVE_HOOK(IVEngineServer, ClientPrintf, engine, SH_MEMBER(this, &PlayerManager::OnClientPrintf), false);
 
 	/* Release forwards */
 	forwardsys->ReleaseForward(m_clconnect);
@@ -855,88 +846,6 @@ void PlayerManager::OnClientDisconnect_Post(edict_t *pEntity)
 	}
 }
 
-void PlayerManager::OnClientPrintf(edict_t *pEdict, const char *szMsg)
-{
-	int client = IndexOfEdict(pEdict);
-
-	CPlayer &player = m_Players[client];
-	if (!player.IsConnected())
-		RETURN_META(MRES_IGNORED);
-
-	INetChannel *pNetChan = static_cast<INetChannel *>(engine->GetPlayerNetInfo(client));
-	if (pNetChan == NULL)
-		RETURN_META(MRES_IGNORED);
-
-	size_t nMsgLen = strlen(szMsg);
-#if SOURCE_ENGINE == SE_EPISODEONE
-	static const int nNumBitsWritten = 0;
-#else
-	int nNumBitsWritten = pNetChan->GetNumBitsWritten(false); // SVC_Print uses unreliable netchan
-#endif
-
-	// if the msg is bigger than allowed then just let it fail
-	if (nMsgLen + 1 >= SVC_Print_BufferSize) // +1 for NETMSG_TYPE_BITS
-		RETURN_META(MRES_IGNORED);
-
-	// enqueue msgs if we'd overflow the SVC_Print buffer (+7 as ceil)
-	if (!player.m_PrintfBuffer.empty() || (nNumBitsWritten + NETMSG_TYPE_BITS + 7) / 8 + nMsgLen >= SVC_Print_BufferSize)
-	{
-		// Don't send any more messages for this player until the buffer is empty.
-		// Queue up a gameframe hook to empty the buffer (if we haven't already)
-		if (player.m_PrintfBuffer.empty())
-			g_SourceMod.AddFrameAction(PrintfBuffer_FrameAction, (void *)(uintptr_t)player.GetSerial());
-
-		player.m_PrintfBuffer.append(szMsg);
-
-		RETURN_META(MRES_SUPERCEDE);
-	}
-
-	RETURN_META(MRES_IGNORED);
-}
-
-void PlayerManager::OnPrintfFrameAction(unsigned int serial)
-{
-	int client = GetClientFromSerial(serial);
-	CPlayer &player = m_Players[client];
-	if (!player.IsConnected())
-	{
-		player.ClearNetchannelQueue();
-		return;
-	}
-
-	INetChannel *pNetChan = static_cast<INetChannel *>(engine->GetPlayerNetInfo(client));
-	if (pNetChan == NULL)
-	{
-		player.ClearNetchannelQueue();
-		return;
-	}
-
-	while (!player.m_PrintfBuffer.empty())
-	{
-#if SOURCE_ENGINE == SE_EPISODEONE
-		static const int nNumBitsWritten = 0;
-#else
-		int nNumBitsWritten = pNetChan->GetNumBitsWritten(false); // SVC_Print uses unreliable netchan
-#endif
-
-		ke::AString &string = player.m_PrintfBuffer.front();
-
-		// stop if we'd overflow the SVC_Print buffer  (+7 as ceil)
-		if ((nNumBitsWritten + NETMSG_TYPE_BITS + 7) / 8 + string.length() >= SVC_Print_BufferSize)
-			break;
-
-		SH_CALL(engine, &IVEngineServer::ClientPrintf)(player.m_pEdict, string.chars());
-
-		player.m_PrintfBuffer.popFront();
-	}
-
-	if (!player.m_PrintfBuffer.empty())
-	{
-		// continue processing it on the next gameframe as buffer is not empty
-		g_SourceMod.AddFrameAction(PrintfBuffer_FrameAction, (void *)(uintptr_t)player.GetSerial());
-	}
-}
-
 void ClientConsolePrint(edict_t *e, const char *fmt, ...)
 {
 	char buffer[512];
@@ -2236,13 +2145,6 @@ void CPlayer::Disconnect()
 #if SOURCE_ENGINE == SE_CSGO
 	m_LanguageCookie = InvalidQueryCvarCookie;
 #endif
-	ClearNetchannelQueue();
-}
-
-void CPlayer::ClearNetchannelQueue(void)
-{
-	while (!m_PrintfBuffer.empty())
-		m_PrintfBuffer.popFront();
 }
 
 void CPlayer::SetName(const char *name)

core/PlayerManager.h

@@ -43,7 +43,6 @@
 #include <sh_list.h>
 #include <sh_vector.h>
 #include <am-string.h>
-#include <am-deque.h>
 #include "ConVarManager.h"
 
 #include <steam/steamclientpublic.h>
@@ -124,7 +123,6 @@ private:
 	bool IsAuthStringValidated();
 	bool SetEngineString();
 	bool SetCSteamID();
-	void ClearNetchannelQueue(void);
 private:
 	bool m_IsConnected = false;
 	bool m_IsInGame = false;
@@ -154,7 +152,6 @@ private:
 #if SOURCE_ENGINE == SE_CSGO
 	QueryCvarCookie_t m_LanguageCookie = InvalidQueryCvarCookie;
 #endif
-	ke::Deque<ke::AString> m_PrintfBuffer;
 };
 
 class PlayerManager : 
@@ -193,8 +190,6 @@ public:
 	void OnClientSettingsChanged(edict_t *pEntity);
 	//void OnClientSettingsChanged_Pre(edict_t *pEntity);
 	void OnServerHibernationUpdate(bool bHibernating);
-	void OnClientPrintf(edict_t *pEdict, const char *szMsg);
-	void OnPrintfFrameAction(unsigned int serial);
 public: //IPlayerManager
 	void AddClientListener(IClientListener *listener);
 	void RemoveClientListener(IClientListener *listener);
@@ -272,9 +267,6 @@ private:
 	int m_SourceTVUserId;
 	int m_ReplayUserId;
 	bool m_bInCCKVHook;
-private:
-	static const int NETMSG_TYPE_BITS = 5; // SVC_Print overhead for netmsg type
-	static const int SVC_Print_BufferSize = 2048 - 1; // -1 for terminating \0
 };
 
 #if SOURCE_ENGINE >= SE_ORANGEBOX

extensions/sdktools/output.cpp

@@ -52,7 +52,6 @@ void EntityOutputManager::Shutdown()
 		return;
 	}
 
-	EntityOutputs->Destroy();
 	ClassNames->Destroy();
 	fireOutputDetour->Destroy();
 }
@@ -66,7 +65,6 @@ void EntityOutputManager::Init()
 		return;
 	}
 
-	EntityOutputs = adtfactory->CreateBasicTrie();
 	ClassNames = adtfactory->CreateBasicTrie();
 }
 
@@ -120,45 +118,30 @@ bool EntityOutputManager::FireEventDetour(void *pOutput, CBaseEntity *pActivator
 		return true;
 	}
 
-	char sOutput[20];
-	ke::SafeSprintf(sOutput, sizeof(sOutput), "%p", pOutput);
-
 	// attempt to directly lookup a hook using the pOutput pointer
 	OutputNameStruct *pOutputName = NULL;
 
-	bool fastLookup = false;
-	
-	// Fast lookup failed - check the slow way for hooks that haven't fired yet
-	if ((fastLookup = EntityOutputs->Retrieve(sOutput, (void **)&pOutputName)) == false)
+	const char *classname = gamehelpers->GetEntityClassname(pCaller);
+	if (!classname)
 	{
-		const char *classname = gamehelpers->GetEntityClassname(pCaller);
-		if (!classname)
-		{
-			return true;
-		}
+		return true;
+	}
 
-		const char *outputname = FindOutputName(pOutput, pCaller);		
-		if (!outputname)
-		{
-			return true;
-		}
+	const char *outputname = FindOutputName(pOutput, pCaller);		
+	if (!outputname)
+	{
+		return true;
+	}
 
-		pOutputName = FindOutputPointer(classname, outputname, false);
+	pOutputName = FindOutputPointer(classname, outputname, false);
 
-		if (!pOutputName)
-		{
-			return true;
-		}
+	if (!pOutputName)
+	{
+		return true;
 	}
 
 	if (!pOutputName->hooks.empty())
 	{
-		if (!fastLookup)
-		{
-			// hook exists on this classname and output - map it into our quick find trie
-			EntityOutputs->Insert(sOutput, pOutputName);
-		}
-
 		SourceHook::List<omg_hooks *>::iterator _iter;
 
 		omg_hooks *hook;

extensions/sdktools/output.h

@@ -121,8 +121,6 @@ private:
 
 	const char *FindOutputName(void *pOutput, CBaseEntity *pCaller);
 
-	//Maps CEntityOutput * to a OutputNameStruct
-	IBasicTrie *EntityOutputs;
 	// Maps classname to a ClassNameStruct
 	IBasicTrie *ClassNames;