1.1 --- a/core/UserMessages.cpp Mon Jul 26 19:26:32 2010 -0400
1.2 +++ b/core/UserMessages.cpp Tue Jul 27 17:32:32 2010 -0500
1.3 @@ -2,7 +2,7 @@
1.4 * vim: set ts=4 :
1.5 * =============================================================================
1.6 * SourceMod
1.7 - * Copyright (C) 2004-2008 AlliedModders LLC. All rights reserved.
1.8 + * Copyright (C) 2004-2010 AlliedModders LLC. All rights reserved.
1.9 * =============================================================================
1.10 *
1.11 * This program is free software; you can redistribute it and/or modify it under
1.12 @@ -34,7 +34,7 @@
1.13
1.14 UserMessages g_UserMsgs;
1.15
1.16 -#if (SOURCE_ENGINE == SE_LEFT4DEAD) || (SOURCE_ENGINE == SE_LEFT4DEAD2)
1.17 +#if SOURCE_ENGINE >= SE_LEFT4DEAD
1.18 SH_DECL_HOOK3(IVEngineServer, UserMessageBegin, SH_NOATTRIB, 0, bf_write *, IRecipientFilter *, int, const char *);
1.19 #else
1.20 SH_DECL_HOOK2(IVEngineServer, UserMessageBegin, SH_NOATTRIB, 0, bf_write *, IRecipientFilter *, int);
1.21 @@ -168,13 +168,13 @@
1.22
1.23 if (m_CurFlags & USERMSG_BLOCKHOOKS)
1.24 {
1.25 -#if (SOURCE_ENGINE == SE_LEFT4DEAD) || (SOURCE_ENGINE == SE_LEFT4DEAD2)
1.26 +#if SOURCE_ENGINE >= SE_LEFT4DEAD
1.27 buffer = ENGINE_CALL(UserMessageBegin)(static_cast<IRecipientFilter *>(&m_CellRecFilter), msg_id, g_SMAPI->GetUserMessage(msg_id));
1.28 #else
1.29 buffer = ENGINE_CALL(UserMessageBegin)(static_cast<IRecipientFilter *>(&m_CellRecFilter), msg_id);
1.30 #endif
1.31 } else {
1.32 -#if (SOURCE_ENGINE == SE_LEFT4DEAD) || (SOURCE_ENGINE == SE_LEFT4DEAD2)
1.33 +#if SOURCE_ENGINE >= SE_LEFT4DEAD
1.34 buffer = engine->UserMessageBegin(static_cast<IRecipientFilter *>(&m_CellRecFilter), msg_id, g_SMAPI->GetUserMessage(msg_id));
1.35 #else
1.36 buffer = engine->UserMessageBegin(static_cast<IRecipientFilter *>(&m_CellRecFilter), msg_id);
1.37 @@ -316,7 +316,7 @@
1.38 }
1.39 }
1.40
1.41 -#if (SOURCE_ENGINE == SE_LEFT4DEAD) || (SOURCE_ENGINE == SE_LEFT4DEAD2)
1.42 +#if SOURCE_ENGINE >= SE_LEFT4DEAD
1.43 bf_write *UserMessages::OnStartMessage_Pre(IRecipientFilter *filter, int msg_type, const char *msg_name)
1.44 #else
1.45 bf_write *UserMessages::OnStartMessage_Pre(IRecipientFilter *filter, int msg_type)
1.46 @@ -346,7 +346,7 @@
1.47 RETURN_META_VALUE(MRES_IGNORED, NULL);
1.48 }
1.49
1.50 -#if (SOURCE_ENGINE == SE_LEFT4DEAD) || (SOURCE_ENGINE == SE_LEFT4DEAD2)
1.51 +#if SOURCE_ENGINE >= SE_LEFT4DEAD
1.52 bf_write *UserMessages::OnStartMessage_Post(IRecipientFilter *filter, int msg_type, const char *msg_name)
1.53 #else
1.54 bf_write *UserMessages::OnStartMessage_Post(IRecipientFilter *filter, int msg_type)
1.55 @@ -500,7 +500,7 @@
1.56 {
1.57 bf_write *engine_bfw;
1.58
1.59 -#if (SOURCE_ENGINE == SE_LEFT4DEAD) || (SOURCE_ENGINE == SE_LEFT4DEAD2)
1.60 +#if SOURCE_ENGINE >= SE_LEFT4DEAD
1.61 engine_bfw = ENGINE_CALL(UserMessageBegin)(m_CurRecFilter, m_CurId, g_SMAPI->GetUserMessage(m_CurId));
1.62 #else
1.63 engine_bfw = ENGINE_CALL(UserMessageBegin)(m_CurRecFilter, m_CurId);