1.1 --- a/core/UserMessages.cpp	Wed Dec 26 17:56:43 2012 -0500
     1.2 +++ b/core/UserMessages.cpp	Wed Dec 26 17:57:03 2012 -0500
     1.3 @@ -34,14 +34,12 @@
     1.4  
     1.5  UserMessages g_UserMsgs;
     1.6  
     1.7 -#ifndef CSGO_USERMESSAGES_ENABLE
     1.8  #if SOURCE_ENGINE >= SE_LEFT4DEAD
     1.9  SH_DECL_HOOK3(IVEngineServer, UserMessageBegin, SH_NOATTRIB, 0, bf_write *, IRecipientFilter *, int, const char *);
    1.10  #else
    1.11  SH_DECL_HOOK2(IVEngineServer, UserMessageBegin, SH_NOATTRIB, 0, bf_write *, IRecipientFilter *, int);
    1.12  #endif
    1.13  SH_DECL_HOOK0_void(IVEngineServer, MessageEnd, SH_NOATTRIB, 0);
    1.14 -#endif
    1.15  
    1.16  UserMessages::UserMessages() : m_InterceptBuffer(m_pBase, 2500)
    1.17  {
    1.18 @@ -80,12 +78,10 @@
    1.19  {
    1.20  	if (m_HookCount)
    1.21  	{
    1.22 -#ifndef CSGO_USERMESSAGES_ENABLE
    1.23  		SH_REMOVE_HOOK_MEMFUNC(IVEngineServer, UserMessageBegin, engine, this, &UserMessages::OnStartMessage_Pre, false);
    1.24  		SH_REMOVE_HOOK_MEMFUNC(IVEngineServer, UserMessageBegin, engine, this, &UserMessages::OnStartMessage_Post, true);
    1.25  		SH_REMOVE_HOOK_MEMFUNC(IVEngineServer, MessageEnd, engine, this, &UserMessages::OnMessageEnd_Pre, false);
    1.26  		SH_REMOVE_HOOK_MEMFUNC(IVEngineServer, MessageEnd, engine, this, &UserMessages::OnMessageEnd_Post, true);
    1.27 -#endif
    1.28  	}
    1.29  	m_HookCount = 0;
    1.30  }
    1.31 @@ -102,7 +98,6 @@
    1.32  			int size;
    1.33  			msgid = 0;
    1.34  
    1.35 -#ifndef CSGO_USERMESSAGES_ENABLE
    1.36  			while (gamedll->GetUserMessageInfo(msgid, msgbuf, sizeof(msgbuf), size))
    1.37  			{
    1.38  				if (strcmp(msgbuf, msg) == 0)
    1.39 @@ -112,7 +107,6 @@
    1.40  				}
    1.41  				msgid++;
    1.42  			}
    1.43 -#endif
    1.44  		}
    1.45  
    1.46  		msgid = g_SMAPI->FindUserMessage(msg);
    1.47 @@ -128,13 +122,11 @@
    1.48  
    1.49  bool UserMessages::GetMessageName(int msgid, char *buffer, size_t maxlength) const
    1.50  {
    1.51 -#ifndef CSGO_USERMESSAGES_ENABLE
    1.52  	if (m_FallbackSearch)
    1.53  	{
    1.54  		int size;
    1.55  		return gamedll->GetUserMessageInfo(msgid, buffer, maxlength, size);
    1.56  	}
    1.57 -#endif
    1.58  
    1.59  	const char *msg = g_SMAPI->GetUserMessage(msgid);
    1.60  
    1.61 @@ -176,7 +168,6 @@
    1.62  
    1.63  	if (m_CurFlags & USERMSG_BLOCKHOOKS)
    1.64  	{
    1.65 -#ifndef CSGO_USERMESSAGES_ENABLE
    1.66  #if SOURCE_ENGINE >= SE_LEFT4DEAD
    1.67  		buffer = ENGINE_CALL(UserMessageBegin)(static_cast<IRecipientFilter *>(&m_CellRecFilter), msg_id, g_SMAPI->GetUserMessage(msg_id));
    1.68  #else
    1.69 @@ -188,7 +179,6 @@
    1.70  #else
    1.71  		buffer = engine->UserMessageBegin(static_cast<IRecipientFilter *>(&m_CellRecFilter), msg_id);
    1.72  #endif
    1.73 -#endif
    1.74  	}
    1.75  
    1.76  	return buffer;
    1.77 @@ -262,12 +252,10 @@
    1.78  
    1.79  	if (!m_HookCount++)
    1.80  	{
    1.81 -#ifndef CSGO_USERMESSAGES_ENABLE
    1.82  		SH_ADD_HOOK_MEMFUNC(IVEngineServer, UserMessageBegin, engine, this, &UserMessages::OnStartMessage_Pre, false);
    1.83  		SH_ADD_HOOK_MEMFUNC(IVEngineServer, UserMessageBegin, engine, this, &UserMessages::OnStartMessage_Post, true);
    1.84  		SH_ADD_HOOK_MEMFUNC(IVEngineServer, MessageEnd, engine, this, &UserMessages::OnMessageEnd_Pre, false);
    1.85  		SH_ADD_HOOK_MEMFUNC(IVEngineServer, MessageEnd, engine, this, &UserMessages::OnMessageEnd_Post, true);
    1.86 -#endif
    1.87  	}
    1.88  
    1.89  	if (intercept)
    1.90 @@ -321,12 +309,10 @@
    1.91  {
    1.92  	if (--m_HookCount == 0)
    1.93  	{
    1.94 -#ifndef CSGO_USERMESSAGES_ENABLE
    1.95  		SH_REMOVE_HOOK_MEMFUNC(IVEngineServer, UserMessageBegin, engine, this, &UserMessages::OnStartMessage_Pre, false);
    1.96  		SH_REMOVE_HOOK_MEMFUNC(IVEngineServer, UserMessageBegin, engine, this, &UserMessages::OnStartMessage_Post, true);
    1.97  		SH_REMOVE_HOOK_MEMFUNC(IVEngineServer, MessageEnd, engine, this, &UserMessages::OnMessageEnd_Pre, false);
    1.98  		SH_REMOVE_HOOK_MEMFUNC(IVEngineServer, MessageEnd, engine, this, &UserMessages::OnMessageEnd_Post, true);
    1.99 -#endif
   1.100  	}
   1.101  }
   1.102  
   1.103 @@ -514,7 +500,6 @@
   1.104  	{
   1.105  		bf_write *engine_bfw;
   1.106  
   1.107 -#ifndef CSGO_USERMESSAGES_ENABLE
   1.108  #if SOURCE_ENGINE >= SE_LEFT4DEAD
   1.109  		engine_bfw = ENGINE_CALL(UserMessageBegin)(m_CurRecFilter, m_CurId, g_SMAPI->GetUserMessage(m_CurId));
   1.110  #else
   1.111 @@ -523,7 +508,6 @@
   1.112  		m_ReadBuffer.StartReading(m_InterceptBuffer.GetBasePointer(), m_InterceptBuffer.GetNumBytesWritten());
   1.113  		engine_bfw->WriteBitsFromBuffer(&m_ReadBuffer, m_InterceptBuffer.GetNumBitsWritten());
   1.114  		ENGINE_CALL(MessageEnd)();
   1.115 -#endif
   1.116  	}
   1.117  
   1.118  	pList = &m_msgHooks[m_CurId];