From b16c758f883e5715f66706f7f9cb43676ad7be2c Mon Sep 17 00:00:00 2001 From: David Anderson Date: Wed, 23 Jun 2010 23:35:28 -0700 Subject: [PATCH 1/5] Removed code now dead from CS:S Orange Box move (bug 4399, r+a13=ds). --- extensions/cstrike/extension.cpp | 5 ---- extensions/cstrike/extension.h | 1 - extensions/cstrike/natives.cpp | 44 -------------------------------- 3 files changed, 50 deletions(-) diff --git a/extensions/cstrike/extension.cpp b/extensions/cstrike/extension.cpp index 549df79e..fd82865d 100644 --- a/extensions/cstrike/extension.cpp +++ b/extensions/cstrike/extension.cpp @@ -76,11 +76,6 @@ bool CStrike::SDK_OnLoad(char *error, size_t maxlength, bool late) sharesys->AddNatives(myself, g_CSNatives); sharesys->RegisterLibrary(myself, "cstrike"); - if ((g_msgHintText = usermsgs->GetMessageIndex("HintText")) != -1) - { - sharesys->OverrideNatives(myself, g_CS_PrintHintText); - } - playerhelpers->RegisterCommandTargetProcessor(this); return true; diff --git a/extensions/cstrike/extension.h b/extensions/cstrike/extension.h index 2434ceb8..5b459866 100644 --- a/extensions/cstrike/extension.h +++ b/extensions/cstrike/extension.h @@ -130,6 +130,5 @@ public: extern IBinTools *g_pBinTools; extern IGameConfig *g_pGameConf; extern int g_msgHintText; -extern sp_nativeinfo_t g_CS_PrintHintText[]; #endif // _INCLUDE_SOURCEMOD_EXTENSION_PROPER_H_ diff --git a/extensions/cstrike/natives.cpp b/extensions/cstrike/natives.cpp index 776f1ae7..ed2e5ceb 100644 --- a/extensions/cstrike/natives.cpp +++ b/extensions/cstrike/natives.cpp @@ -71,45 +71,6 @@ inline CBaseEntity *GetCBaseEntity(int num, bool isplayer) return pUnk->GetBaseEntity(); } -static cell_t CS_PrintHintText(IPluginContext *pContext, const cell_t *params) -{ - int client = params[1]; - IGamePlayer *pPlayer = playerhelpers->GetGamePlayer(params[1]); - - if (!pPlayer) - { - return pContext->ThrowNativeError("Client index %d is invalid", client); - } - - if (!pPlayer->IsInGame()) - { - return pContext->ThrowNativeError("Client %d is not in game", client); - } - - g_pSM->SetGlobalTarget(client); - - char buffer[192]; - g_pSM->FormatString(buffer, sizeof(buffer), pContext, params, 2); - - /* Check for an error before printing to the client */ - if (pContext->GetLastNativeError() != SP_ERROR_NONE) - { - return 0; - } - - bf_write *pBitBuf = usermsgs->StartMessage(g_msgHintText, ¶ms[1], 1, USERMSG_RELIABLE); - if (pBitBuf == NULL) - { - return pContext->ThrowNativeError("Could not send a usermessage"); - } - pBitBuf->WriteByte(1); - pBitBuf->WriteString(buffer); - usermsgs->EndMessage(); - - return 1; -} - - static cell_t CS_RespawnPlayer(IPluginContext *pContext, const cell_t *params) { static ICallWrapper *pWrapper = NULL; @@ -166,8 +127,3 @@ sp_nativeinfo_t g_CSNatives[] = {NULL, NULL} }; -sp_nativeinfo_t g_CS_PrintHintText[] = -{ - {"PrintHintText", CS_PrintHintText}, - {NULL, NULL}, -}; From fe0b9f73201fa1954c3e90836bd9d3235c08c7a1 Mon Sep 17 00:00:00 2001 From: David Anderson Date: Wed, 23 Jun 2010 23:43:09 -0700 Subject: [PATCH 2/5] Updated changelog. --- changelog.txt | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/changelog.txt b/changelog.txt index c213af38..43becd46 100644 --- a/changelog.txt +++ b/changelog.txt @@ -2,6 +2,32 @@ SourceMod Changelog ---------------------------- +SourceMod 1.3.3 [2010-06-23] + +URL: http://wiki.alliedmods.net/SourceMod_1.3.3_Release_Notes + +User Changes: + + - Added support for CS:S on Orange Box + - Added gamedata for Resistance and Liberation (bug 4418). + - Updated gamedata for SourceForts, Empires, Obsidian Conflict, Zombie Master. + - Fixed memory corruption and leaks with some voice functionality (bug 4415). + - Fixed UI bug in sm_motd (bug 4460). + +Developer Changes: + + - Added new player condition (TFCond_CritCola, bug 4447). + - Fixed clientprefs deleting cookies twice in rare cases (bug 4412). + - Fixed OnClientConnected forward not firing for bots (bug 4443). + - Fixed sm_dump_datamaps crash (bug 4424). + - Fixed switch case comparisons failing with large numbers (bug 4457). + - Fixed rare crash in output hooks (bug 4422). + - Fixed bug with dynamically sized arrays being sliced (bug 4428). + - Fixed SendConVarValue() on TF2, DOD:S, L4D, and L4D2 (bug 4273). + - Fixed TF2 natives not being marked optional (bug 4389). + +---------------------------- + SourceMod 1.3.2 [2010-05-02] URL: http://wiki.alliedmods.net/SourceMod_1.3.2_Release_Notes From 49e2303a5beba42c826cbbb9746a37b1a2b3af8e Mon Sep 17 00:00:00 2001 From: David Anderson Date: Wed, 23 Jun 2010 23:44:14 -0700 Subject: [PATCH 3/5] Bumped version to 1.3.3 for release. --- plugins/include/version.inc | 2 +- product.version | 2 +- tools/buildbot/build_type | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/include/version.inc b/plugins/include/version.inc index fcef5efe..bc91de8d 100644 --- a/plugins/include/version.inc +++ b/plugins/include/version.inc @@ -39,4 +39,4 @@ #define SOURCEMOD_V_MINOR 3 /**< SourceMod Minor version */ #define SOURCEMOD_V_RELEASE 3 /**< SourceMod Release version */ -#define SOURCEMOD_VERSION "1.3.3-dev" /**< SourceMod version string (major.minor.release.build) */ +#define SOURCEMOD_VERSION "1.3.3" /**< SourceMod version string (major.minor.release.build) */ diff --git a/product.version b/product.version index 456ea726..31e5c843 100644 --- a/product.version +++ b/product.version @@ -1 +1 @@ -1.3.3-dev +1.3.3 diff --git a/tools/buildbot/build_type b/tools/buildbot/build_type index 38f8e886..17640be7 100644 --- a/tools/buildbot/build_type +++ b/tools/buildbot/build_type @@ -1 +1 @@ -dev +rel From 7fb3632fd76bd0cf12d97303b549dde17df14c2c Mon Sep 17 00:00:00 2001 From: David Anderson Date: Thu, 24 Jun 2010 01:25:25 -0700 Subject: [PATCH 4/5] Bumped version to 1.3.4-dev. --- plugins/include/version.inc | 4 ++-- product.version | 2 +- tools/buildbot/build_type | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/plugins/include/version.inc b/plugins/include/version.inc index bc91de8d..46231cb8 100644 --- a/plugins/include/version.inc +++ b/plugins/include/version.inc @@ -37,6 +37,6 @@ #define SOURCEMOD_V_MAJOR 1 /**< SourceMod Major version */ #define SOURCEMOD_V_MINOR 3 /**< SourceMod Minor version */ -#define SOURCEMOD_V_RELEASE 3 /**< SourceMod Release version */ +#define SOURCEMOD_V_RELEASE 4 /**< SourceMod Release version */ -#define SOURCEMOD_VERSION "1.3.3" /**< SourceMod version string (major.minor.release.build) */ +#define SOURCEMOD_VERSION "1.3.4-dev" /**< SourceMod version string (major.minor.release.build) */ diff --git a/product.version b/product.version index 31e5c843..7285a062 100644 --- a/product.version +++ b/product.version @@ -1 +1 @@ -1.3.3 +1.3.4-dev diff --git a/tools/buildbot/build_type b/tools/buildbot/build_type index 17640be7..38f8e886 100644 --- a/tools/buildbot/build_type +++ b/tools/buildbot/build_type @@ -1 +1 @@ -rel +dev From d64125ddd4bfb5f7e51f80bf77a2b490126ee2ef Mon Sep 17 00:00:00 2001 From: David Anderson Date: Thu, 24 Jun 2010 01:42:39 -0700 Subject: [PATCH 5/5] Added tag sourcemod-1.3.3 for changeset c5062ca82830 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 67031eec..bbc1693a 100644 --- a/.hgtags +++ b/.hgtags @@ -6,3 +6,4 @@ b3ffa8a4511c4eadaf533fc790aa6b14f7f0c6ea sourcemod-1.1.2 a71318396392e3c6d0ff31e069a60fbde59e0cea sourcemod-1.3.0 3f33d01fcc28b509bed30f7be07ed215cc000538 sourcemod-1.3.1 a3e8f7a7fdf7f012dd02ad491a2e1ccdad151687 sourcemod-1.3.2 +c5062ca8283033cf33f45da6f19e486ca10835ff sourcemod-1.3.3