From 407e58604f694857b250cd670e9769a0be4facc8 Mon Sep 17 00:00:00 2001 From: Matt Woodrow Date: Fri, 27 Feb 2009 10:19:46 +1300 Subject: [PATCH 1/5] Fixed Critical hits being permanently disabled (bug 2674, r=dvander) --- extensions/tf2/criticals.cpp | 91 +++++++++++++++++++++++++++---- extensions/tf2/extension.cpp | 28 ++++++++-- extensions/tf2/extension.h | 41 ++++---------- extensions/tf2/sdk/smsdk_config.h | 1 + extensions/tf2/sdk/smsdk_ext.h | 6 ++ 5 files changed, 120 insertions(+), 47 deletions(-) diff --git a/extensions/tf2/criticals.cpp b/extensions/tf2/criticals.cpp index 81312f08..7d6233e7 100644 --- a/extensions/tf2/criticals.cpp +++ b/extensions/tf2/criticals.cpp @@ -39,6 +39,13 @@ CDetour *calcIsAttackCriticalKnifeDetour = NULL; IForward *g_critForward = NULL; +enum DetourResult +{ + Result_Ignore, + Result_NoCrit, + Result_Crit, +}; + int CheckBaseHandle(CBaseHandle &hndl) { if (!hndl.IsValid()) @@ -72,14 +79,14 @@ int CheckBaseHandle(CBaseHandle &hndl) return index; } -DETOUR_DECL_MEMBER0(CalcIsAttackCriticalHelper, bool) +DetourResult DetourCallback(CBaseEntity *pEnt) { - edict_t *pEdict = gameents->BaseEntityToEdict((CBaseEntity *)this); - + edict_t *pEdict = gameents->BaseEntityToEdict((CBaseEntity *)pEnt); + if (!pEdict) { g_pSM->LogMessage(myself, "Entity Error"); - return false; + return Result_Ignore; } sm_sendprop_info_t info; @@ -87,18 +94,18 @@ DETOUR_DECL_MEMBER0(CalcIsAttackCriticalHelper, bool) if (!gamehelpers->FindSendPropInfo(pEdict->GetNetworkable()->GetServerClass()->GetName(), "m_hOwnerEntity", &info)) { g_pSM->LogMessage(myself, "Offset Error"); - return false; + return Result_Ignore; } if (!g_critForward) { g_pSM->LogMessage(myself, "Invalid Forward"); - return false; + return Result_Ignore; } int returnValue=0; - - CBaseHandle &hndl = *(CBaseHandle *)((uint8_t *)this + info.actual_offset); + + CBaseHandle &hndl = *(CBaseHandle *)((uint8_t *)pEnt + info.actual_offset); int index = CheckBaseHandle(hndl); g_critForward->PushCell(index); //Client index @@ -112,20 +119,80 @@ DETOUR_DECL_MEMBER0(CalcIsAttackCriticalHelper, bool) if (result) { - return !!returnValue; + if (returnValue) + { + return Result_Crit; + } + else + { + return Result_NoCrit; + } } else + { + return Result_Ignore; + } +} + +DETOUR_DECL_MEMBER0(CalcIsAttackCriticalHelperMelee, bool) +{ + DetourResult result = DetourCallback((CBaseEntity *)this); + + if (result == Result_Ignore) + { + return DETOUR_MEMBER_CALL(CalcIsAttackCriticalHelperMelee)(); + } + else if (result == Result_NoCrit) + { + return 0; + } + else + { + return 1; + } +} + +DETOUR_DECL_MEMBER0(CalcIsAttackCriticalHelperKnife, bool) +{ + DetourResult result = DetourCallback((CBaseEntity *)this); + + if (result == Result_Ignore) + { + return DETOUR_MEMBER_CALL(CalcIsAttackCriticalHelperKnife)(); + } + else if (result == Result_NoCrit) + { + return 0; + } + else + { + return 1; + } +} + +DETOUR_DECL_MEMBER0(CalcIsAttackCriticalHelper, bool) +{ + DetourResult result = DetourCallback((CBaseEntity *)this); + + if (result == Result_Ignore) { return DETOUR_MEMBER_CALL(CalcIsAttackCriticalHelper)(); } - + else if (result == Result_NoCrit) + { + return 0; + } + else + { + return 1; + } } void InitialiseDetours() { calcIsAttackCriticalDetour = DETOUR_CREATE_MEMBER(CalcIsAttackCriticalHelper, "CalcCritical"); - calcIsAttackCriticalMeleeDetour = DETOUR_CREATE_MEMBER(CalcIsAttackCriticalHelper, "CalcCriticalMelee"); - calcIsAttackCriticalKnifeDetour = DETOUR_CREATE_MEMBER(CalcIsAttackCriticalHelper, "CalcCriticalKnife"); + calcIsAttackCriticalMeleeDetour = DETOUR_CREATE_MEMBER(CalcIsAttackCriticalHelperMelee, "CalcCriticalMelee"); + calcIsAttackCriticalKnifeDetour = DETOUR_CREATE_MEMBER(CalcIsAttackCriticalHelperKnife, "CalcCriticalKnife"); bool HookCreated = false; diff --git a/extensions/tf2/extension.cpp b/extensions/tf2/extension.cpp index 71cdc5a0..a7a5f09f 100644 --- a/extensions/tf2/extension.cpp +++ b/extensions/tf2/extension.cpp @@ -102,12 +102,16 @@ bool TF2Tools::SDK_OnLoad(char *error, size_t maxlength, bool late) sharesys->AddNatives(myself, g_TFNatives); sharesys->RegisterLibrary(myself, "tf2"); + plsys->AddPluginsListener(this); + playerhelpers->RegisterCommandTargetProcessor(this); g_critForward = forwards->CreateForward("TF2_CalcIsAttackCritical", ET_Hook, 4, NULL, Param_Cell, Param_Cell, Param_String, Param_CellByRef); g_pCVar = icvar; + m_DetoursEnabled = false; + return true; } @@ -137,16 +141,14 @@ void TF2Tools::SDK_OnUnload() gameconfs->CloseGameConfigFile(g_pGameConf); playerhelpers->UnregisterCommandTargetProcessor(this); - forwards->ReleaseForward(g_critForward); + plsys->RemovePluginsListener(this); - RemoveDetours(); + forwards->ReleaseForward(g_critForward); } void TF2Tools::SDK_OnAllLoaded() { SM_GET_LATE_IFACE(BINTOOLS, g_pBinTools); - - InitialiseDetours(); } bool TF2Tools::RegisterConCommandBase(ConCommandBase *pVar) @@ -187,7 +189,6 @@ void OnServerActivate(edict_t *pEdictList, int edictCount, int clientMax) g_resourceEntity = FindResourceEntity(); } - bool TF2Tools::ProcessCommandTarget(cmd_target_info_t *info) { int max_clients; @@ -283,6 +284,23 @@ bool TF2Tools::ProcessCommandTarget(cmd_target_info_t *info) return true; } +void TF2Tools::OnPluginLoaded(IPlugin *plugin) +{ + if (!m_DetoursEnabled && g_critForward->GetFunctionCount()) + { + InitialiseDetours(); + m_DetoursEnabled = true; + } +} + +void TF2Tools::OnPluginUnloaded(IPlugin *plugin) +{ + if (m_DetoursEnabled && !g_critForward->GetFunctionCount()) + { + RemoveDetours(); + m_DetoursEnabled = false; + } +} int FindResourceEntity() { return FindEntityByNetClass(-1, "CTFPlayerResource"); diff --git a/extensions/tf2/extension.h b/extensions/tf2/extension.h index be9482d2..ac94d966 100644 --- a/extensions/tf2/extension.h +++ b/extensions/tf2/extension.h @@ -50,9 +50,10 @@ class TF2Tools : public SDKExtension, public ICommandTargetProcessor, public IConCommandBaseAccessor, - public IGameEventListener2 + public IGameEventListener2, + public IPluginsListener { -public: +public: //SDKExtension /** * @brief This is called after the initial loading sequence has been processed. * @@ -74,11 +75,6 @@ public: */ virtual void SDK_OnAllLoaded(); - /** - * @brief Called when the pause state is changed. - */ - //virtual void SDK_OnPauseChange(bool paused); - /** * @brief this is called when Core wants to know if your extension is working. * @@ -90,12 +86,16 @@ public: void NotifyInterfaceDrop(SMInterface *pInterface); bool QueryInterfaceDrop(SMInterface *pInterface); -public: +public: //ICommandTargetProcessor bool ProcessCommandTarget(cmd_target_info_t *info); +public: //IConCommandBaseAccessor bool RegisterConCommandBase(ConCommandBase *pVar); - +public: //IGameEventManager IGameEventManager2 *m_GameEventManager; void FireGameEvent( IGameEvent *event ); +public: //IPluginsListener + void OnPluginLoaded(IPlugin *plugin); + void OnPluginUnloaded(IPlugin *plugin); public: #if defined SMEXT_CONF_METAMOD /** @@ -107,28 +107,9 @@ public: * @return True to succeed, false to fail. */ virtual bool SDK_OnMetamodLoad(ISmmAPI *ismm, char *error, size_t maxlength, bool late); - - /** - * @brief Called when Metamod is detaching, after the extension version is called. - * NOTE: By default this is blocked unless sent from SourceMod. - * - * @param error Error buffer. - * @param maxlength Maximum size of error buffer. - * @return True to succeed, false to fail. - */ - //virtual bool SDK_OnMetamodUnload(char *error, size_t maxlength); - - /** - * @brief Called when Metamod's pause state is changing. - * NOTE: By default this is blocked unless sent from SourceMod. - * - * @param paused Pause state being set. - * @param error Error buffer. - * @param maxlength Maximum size of error buffer. - * @return True to succeed, false to fail. - */ - //virtual bool SDK_OnMetamodPauseChange(bool paused, char *error, size_t maxlength); #endif +private: + bool m_DetoursEnabled; }; enum TFClassType diff --git a/extensions/tf2/sdk/smsdk_config.h b/extensions/tf2/sdk/smsdk_config.h index a9d6638c..fe342bd2 100644 --- a/extensions/tf2/sdk/smsdk_config.h +++ b/extensions/tf2/sdk/smsdk_config.h @@ -72,5 +72,6 @@ //#define SMEXT_ENABLE_THREADER //#define SMEXT_ENABLE_LIBSYS //#define SMEXT_ENABLE_USERMSGS +#define SMEXT_ENABLE_PLUGINSYS #endif // _INCLUDE_SOURCEMOD_EXTENSION_CONFIG_H_ diff --git a/extensions/tf2/sdk/smsdk_ext.h b/extensions/tf2/sdk/smsdk_ext.h index 3d5a229d..a2fabeb9 100644 --- a/extensions/tf2/sdk/smsdk_ext.h +++ b/extensions/tf2/sdk/smsdk_ext.h @@ -76,6 +76,9 @@ #if defined SMEXT_ENABLE_USERMSGS #include #endif +#if defined SMEXT_ENABLE_PLUGINSYS +#include +#endif #if defined SMEXT_CONF_METAMOD #include @@ -266,6 +269,9 @@ extern ILibrarySys *libsys; #if defined SMEXT_ENABLE_USERMSGS extern IUserMessages *usermsgs; #endif +#if defined SMEXT_ENABLE_PLUGINSYS +extern IPluginManager *plsys; +#endif #if defined SMEXT_CONF_METAMOD PLUGIN_GLOBALVARS(); From 0d6c6bdb58ccb53e60e618e96da51d86617722da Mon Sep 17 00:00:00 2001 From: Matt Woodrow Date: Thu, 26 Feb 2009 16:48:31 -0500 Subject: [PATCH 2/5] Updated changelog and removed -dev tag --- changelog.txt | 12 +++++++++++- tools/buildbot/bootstrap.pl | 2 +- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/changelog.txt b/changelog.txt index 2c5911b3..59932958 100644 --- a/changelog.txt +++ b/changelog.txt @@ -2,9 +2,19 @@ SourceMod Changelog ---------------------------- +SourceMod 1.1.2 [2009-02-26] + +URL: http://wiki.alliedmods.net/SourceMod_1.1.2_Release_Notes + +Changes: + + - Fixed critical hits being permanently disabled (bug 2674) + +---------------------------- + SourceMod 1.1.1 [2009-02-25] -URL: http://wiki.alliedmods.net/SourceMod_1.1.1_Release Notes +URL: http://wiki.alliedmods.net/SourceMod_1.1.1_Release_Notes Changes: diff --git a/tools/buildbot/bootstrap.pl b/tools/buildbot/bootstrap.pl index fc15c906..0aaacf58 100755 --- a/tools/buildbot/bootstrap.pl +++ b/tools/buildbot/bootstrap.pl @@ -57,4 +57,4 @@ if ($^O eq "linux") Build::Command("flip -u tools/versionchanger.pl"); Build::Command("chmod +x tools/versionchanger.pl"); } -Build::Command(Build::PathFormat('tools/versionchanger.pl') . ' --buildstring="-dev"'); +#Build::Command(Build::PathFormat('tools/versionchanger.pl') . ' --buildstring="-dev"'); From cc91beece74e22407982b5b5e82fe13dfa6e308d Mon Sep 17 00:00:00 2001 From: Matt Woodrow Date: Thu, 26 Feb 2009 16:54:03 -0500 Subject: [PATCH 3/5] Bumped all versions --- core/sm_version.h | 8 ++++---- extensions/bintools/svn_version.h | 8 ++++---- extensions/clientprefs/svn_version.h | 8 ++++---- extensions/cstrike/svn_version.h | 8 ++++---- extensions/geoip/svn_version.h | 8 ++++---- extensions/mysql/svn_version.h | 8 ++++---- extensions/regex/svn_version.h | 8 ++++---- extensions/sdktools/svn_version.h | 8 ++++---- extensions/sqlite/svn_version.h | 8 ++++---- extensions/tf2/svn_version.h | 8 ++++---- extensions/topmenus/svn_version.h | 8 ++++---- loader/svn_version.h | 8 ++++---- modules.versions | 2 +- plugins/include/version.inc | 4 ++-- product.version | 2 +- sourcepawn/compiler/svn_version.h | 8 ++++---- sourcepawn/jit/jit_version.h | 8 ++++---- 17 files changed, 60 insertions(+), 60 deletions(-) diff --git a/core/sm_version.h b/core/sm_version.h index fb06f12f..a73bfa71 100644 --- a/core/sm_version.h +++ b/core/sm_version.h @@ -40,9 +40,9 @@ * @file Contains SourceMod version information. */ -#define SM_BUILD_STRING "-dev" -#define SM_BUILD_UNIQUEID "2477:651b94271b43" SM_BUILD_STRING -#define SVN_FULL_VERSION "1.1.1" SM_BUILD_STRING -#define SVN_FILE_VERSION 1,1,1,0 +#define SM_BUILD_STRING "" +#define SM_BUILD_UNIQUEID "2481:c1fe549598cd" SM_BUILD_STRING +#define SVN_FULL_VERSION "1.1.2" SM_BUILD_STRING +#define SVN_FILE_VERSION 1,1,2,0 #endif //_INCLUDE_SOURCEMOD_VERSION_H_ diff --git a/extensions/bintools/svn_version.h b/extensions/bintools/svn_version.h index 474fdce7..bb170b72 100644 --- a/extensions/bintools/svn_version.h +++ b/extensions/bintools/svn_version.h @@ -36,9 +36,9 @@ #ifndef _INCLUDE_BINTOOLS_VERSION_H_ #define _INCLUDE_BINTOOLS_VERSION_H_ -#define SM_BUILD_STRING "-dev" -#define SM_BUILD_UNIQUEID "2477:651b94271b43" SM_BUILD_STRING -#define SVN_FULL_VERSION "1.1.1" SM_BUILD_STRING -#define SVN_FILE_VERSION 1,1,1,0 +#define SM_BUILD_STRING "" +#define SM_BUILD_UNIQUEID "2481:c1fe549598cd" SM_BUILD_STRING +#define SVN_FULL_VERSION "1.1.2" SM_BUILD_STRING +#define SVN_FILE_VERSION 1,1,2,0 #endif //_INCLUDE_BINTOOLS_VERSION_H_ diff --git a/extensions/clientprefs/svn_version.h b/extensions/clientprefs/svn_version.h index 9ae5e24d..fb4960c0 100644 --- a/extensions/clientprefs/svn_version.h +++ b/extensions/clientprefs/svn_version.h @@ -36,9 +36,9 @@ #ifndef _INCLUDE_CLIENTPREFS_VERSION_H_ #define _INCLUDE_CLIENTPREFS_VERSION_H_ -#define SM_BUILD_STRING "-dev" -#define SM_BUILD_UNIQUEID "2477:651b94271b43" SM_BUILD_STRING -#define SVN_FULL_VERSION "1.1.1" SM_BUILD_STRING -#define SVN_FILE_VERSION 1,1,1,0 +#define SM_BUILD_STRING "" +#define SM_BUILD_UNIQUEID "2481:c1fe549598cd" SM_BUILD_STRING +#define SVN_FULL_VERSION "1.1.2" SM_BUILD_STRING +#define SVN_FILE_VERSION 1,1,2,0 #endif //_INCLUDE_CLIENTPREFS_VERSION_H_ diff --git a/extensions/cstrike/svn_version.h b/extensions/cstrike/svn_version.h index b570352e..9c5a82ce 100644 --- a/extensions/cstrike/svn_version.h +++ b/extensions/cstrike/svn_version.h @@ -36,9 +36,9 @@ #ifndef _INCLUDE_SDKTOOLS_VERSION_H_ #define _INCLUDE_SDKTOOLS_VERSION_H_ -#define SM_BUILD_STRING "-dev" -#define SM_BUILD_UNIQUEID "2477:651b94271b43" SM_BUILD_STRING -#define SVN_FULL_VERSION "1.1.1" SM_BUILD_STRING -#define SVN_FILE_VERSION 1,1,1,0 +#define SM_BUILD_STRING "" +#define SM_BUILD_UNIQUEID "2481:c1fe549598cd" SM_BUILD_STRING +#define SVN_FULL_VERSION "1.1.2" SM_BUILD_STRING +#define SVN_FILE_VERSION 1,1,2,0 #endif //_INCLUDE_SDKTOOLS_VERSION_H_ diff --git a/extensions/geoip/svn_version.h b/extensions/geoip/svn_version.h index 16d275a5..57d9a1cf 100644 --- a/extensions/geoip/svn_version.h +++ b/extensions/geoip/svn_version.h @@ -36,9 +36,9 @@ #ifndef _INCLUDE_GEOIP_VERSION_H_ #define _INCLUDE_GEOIP_VERSION_H_ -#define SM_BUILD_STRING "-dev" -#define SM_BUILD_UNIQUEID "2477:651b94271b43" SM_BUILD_STRING -#define SVN_FULL_VERSION "1.1.1" SM_BUILD_STRING -#define SVN_FILE_VERSION 1,1,1,0 +#define SM_BUILD_STRING "" +#define SM_BUILD_UNIQUEID "2481:c1fe549598cd" SM_BUILD_STRING +#define SVN_FULL_VERSION "1.1.2" SM_BUILD_STRING +#define SVN_FILE_VERSION 1,1,2,0 #endif //_INCLUDE_GEOIP_VERSION_H_ diff --git a/extensions/mysql/svn_version.h b/extensions/mysql/svn_version.h index 2c9de262..2be6f344 100644 --- a/extensions/mysql/svn_version.h +++ b/extensions/mysql/svn_version.h @@ -36,9 +36,9 @@ #ifndef _INCLUDE_MYSQLEXT_VERSION_H_ #define _INCLUDE_MYSQLEXT_VERSION_H_ -#define SM_BUILD_STRING "-dev" -#define SM_BUILD_UNIQUEID "2477:651b94271b43" SM_BUILD_STRING -#define SVN_FULL_VERSION "1.1.1" SM_BUILD_STRING -#define SVN_FILE_VERSION 1,1,1,0 +#define SM_BUILD_STRING "" +#define SM_BUILD_UNIQUEID "2481:c1fe549598cd" SM_BUILD_STRING +#define SVN_FULL_VERSION "1.1.2" SM_BUILD_STRING +#define SVN_FILE_VERSION 1,1,2,0 #endif //_INCLUDE_MYSQLEXT_VERSION_H_ diff --git a/extensions/regex/svn_version.h b/extensions/regex/svn_version.h index be2e2931..2dfe35d9 100644 --- a/extensions/regex/svn_version.h +++ b/extensions/regex/svn_version.h @@ -36,9 +36,9 @@ #ifndef _INCLUDE_REGEXEXT_VERSION_H_ #define _INCLUDE_REGEXEXT_VERSION_H_ -#define SM_BUILD_STRING "-dev" -#define SM_BUILD_UNIQUEID "2477:651b94271b43" SM_BUILD_STRING -#define SVN_FULL_VERSION "1.1.1" SM_BUILD_STRING -#define SVN_FILE_VERSION 1,1,1,0 +#define SM_BUILD_STRING "" +#define SM_BUILD_UNIQUEID "2481:c1fe549598cd" SM_BUILD_STRING +#define SVN_FULL_VERSION "1.1.2" SM_BUILD_STRING +#define SVN_FILE_VERSION 1,1,2,0 #endif //_INCLUDE_REGEXEXT_VERSION_H_ diff --git a/extensions/sdktools/svn_version.h b/extensions/sdktools/svn_version.h index 1232b34d..96f036cd 100644 --- a/extensions/sdktools/svn_version.h +++ b/extensions/sdktools/svn_version.h @@ -36,9 +36,9 @@ #ifndef _INCLUDE_SDKTOOLS_VERSION_H_ #define _INCLUDE_SDKTOOLS_VERSION_H_ -#define SM_BUILD_STRING "-dev" -#define SM_BUILD_UNIQUEID "2477:651b94271b43" SM_BUILD_STRING -#define SVN_FULL_VERSION "1.1.1" SM_BUILD_STRING -#define SVN_FILE_VERSION 1,1,1,0 +#define SM_BUILD_STRING "" +#define SM_BUILD_UNIQUEID "2481:c1fe549598cd" SM_BUILD_STRING +#define SVN_FULL_VERSION "1.1.2" SM_BUILD_STRING +#define SVN_FILE_VERSION 1,1,2,0 #endif //_INCLUDE_SDKTOOLS_VERSION_H_ diff --git a/extensions/sqlite/svn_version.h b/extensions/sqlite/svn_version.h index fe81084d..b43a2dd3 100644 --- a/extensions/sqlite/svn_version.h +++ b/extensions/sqlite/svn_version.h @@ -36,9 +36,9 @@ #ifndef _INCLUDE_SQLITEEXT_VERSION_H_ #define _INCLUDE_SQLITEEXT_VERSION_H_ -#define SM_BUILD_STRING "-dev" -#define SM_BUILD_UNIQUEID "2477:651b94271b43" SM_BUILD_STRING -#define SVN_FULL_VERSION "1.1.1" SM_BUILD_STRING -#define SVN_FILE_VERSION 1,1,1,0 +#define SM_BUILD_STRING "" +#define SM_BUILD_UNIQUEID "2481:c1fe549598cd" SM_BUILD_STRING +#define SVN_FULL_VERSION "1.1.2" SM_BUILD_STRING +#define SVN_FILE_VERSION 1,1,2,0 #endif //_INCLUDE_SQLITEEXT_VERSION_H_ diff --git a/extensions/tf2/svn_version.h b/extensions/tf2/svn_version.h index 5f12f0b0..893382e9 100644 --- a/extensions/tf2/svn_version.h +++ b/extensions/tf2/svn_version.h @@ -36,9 +36,9 @@ #ifndef _INCLUDE_SDKTOOLS_VERSION_H_ #define _INCLUDE_SDKTOOLS_VERSION_H_ -#define SM_BUILD_STRING "-dev" -#define SM_BUILD_UNIQUEID "2477:651b94271b43" SM_BUILD_STRING -#define SVN_FULL_VERSION "1.1.1" SM_BUILD_STRING -#define SVN_FILE_VERSION 1,1,1,0 +#define SM_BUILD_STRING "" +#define SM_BUILD_UNIQUEID "2481:c1fe549598cd" SM_BUILD_STRING +#define SVN_FULL_VERSION "1.1.2" SM_BUILD_STRING +#define SVN_FILE_VERSION 1,1,2,0 #endif //_INCLUDE_SDKTOOLS_VERSION_H_ diff --git a/extensions/topmenus/svn_version.h b/extensions/topmenus/svn_version.h index cfec0263..527ebf43 100644 --- a/extensions/topmenus/svn_version.h +++ b/extensions/topmenus/svn_version.h @@ -36,9 +36,9 @@ #ifndef _INCLUDE_SQLITEEXT_VERSION_H_ #define _INCLUDE_SQLITEEXT_VERSION_H_ -#define SM_BUILD_STRING "-dev" -#define SM_BUILD_UNIQUEID "2477:651b94271b43" SM_BUILD_STRING -#define SVN_FULL_VERSION "1.1.1" SM_BUILD_STRING -#define SVN_FILE_VERSION 1,1,1,0 +#define SM_BUILD_STRING "" +#define SM_BUILD_UNIQUEID "2481:c1fe549598cd" SM_BUILD_STRING +#define SVN_FULL_VERSION "1.1.2" SM_BUILD_STRING +#define SVN_FILE_VERSION 1,1,2,0 #endif //_INCLUDE_SQLITEEXT_VERSION_H_ diff --git a/loader/svn_version.h b/loader/svn_version.h index fb06f12f..a73bfa71 100644 --- a/loader/svn_version.h +++ b/loader/svn_version.h @@ -40,9 +40,9 @@ * @file Contains SourceMod version information. */ -#define SM_BUILD_STRING "-dev" -#define SM_BUILD_UNIQUEID "2477:651b94271b43" SM_BUILD_STRING -#define SVN_FULL_VERSION "1.1.1" SM_BUILD_STRING -#define SVN_FILE_VERSION 1,1,1,0 +#define SM_BUILD_STRING "" +#define SM_BUILD_UNIQUEID "2481:c1fe549598cd" SM_BUILD_STRING +#define SVN_FULL_VERSION "1.1.2" SM_BUILD_STRING +#define SVN_FILE_VERSION 1,1,2,0 #endif //_INCLUDE_SOURCEMOD_VERSION_H_ diff --git a/modules.versions b/modules.versions index 0a6ba7df..73ea021d 100644 --- a/modules.versions +++ b/modules.versions @@ -1,7 +1,7 @@ [PRODUCT] major = 1 minor = 1 -revision = 1 +revision = 2 [core] folder = core diff --git a/plugins/include/version.inc b/plugins/include/version.inc index 3da3fad4..22de2535 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 1 /**< SourceMod Minor version */ -#define SOURCEMOD_V_RELEASE 1 /**< SourceMod Release version */ +#define SOURCEMOD_V_RELEASE 2 /**< SourceMod Release version */ -#define SOURCEMOD_VERSION "1.1.1-dev" /**< SourceMod version string (major.minor.release.build) */ +#define SOURCEMOD_VERSION "1.1.2" /**< SourceMod version string (major.minor.release.build) */ diff --git a/product.version b/product.version index 524cb552..45a1b3f4 100644 --- a/product.version +++ b/product.version @@ -1 +1 @@ -1.1.1 +1.1.2 diff --git a/sourcepawn/compiler/svn_version.h b/sourcepawn/compiler/svn_version.h index b9b16368..702e29f1 100644 --- a/sourcepawn/compiler/svn_version.h +++ b/sourcepawn/compiler/svn_version.h @@ -19,9 +19,9 @@ * @file Contains SourceMod version information. */ -#define SM_BUILD_STRING "-dev" -#define SM_BUILD_UNIQUEID "2477:651b94271b43" SM_BUILD_STRING -#define SVN_FULL_VERSION "1.1.1" SM_BUILD_STRING -#define SVN_FILE_VERSION 1,1,1,0 +#define SM_BUILD_STRING "" +#define SM_BUILD_UNIQUEID "2481:c1fe549598cd" SM_BUILD_STRING +#define SVN_FULL_VERSION "1.1.2" SM_BUILD_STRING +#define SVN_FILE_VERSION 1,1,2,0 #endif //_INCLUDE_SOURCEMOD_VERSION_H_ diff --git a/sourcepawn/jit/jit_version.h b/sourcepawn/jit/jit_version.h index 13d3d2c9..35274352 100644 --- a/sourcepawn/jit/jit_version.h +++ b/sourcepawn/jit/jit_version.h @@ -32,9 +32,9 @@ #ifndef _INCLUDE_JIT_VERSION_H_ #define _INCLUDE_JIT_VERSION_H_ -#define SM_BUILD_STRING "-dev" -#define SM_BUILD_UNIQUEID "2477:651b94271b43" SM_BUILD_STRING -#define SVN_FULL_VERSION "1.1.1" SM_BUILD_STRING -#define SVN_FILE_VERSION 1,1,1,0 +#define SM_BUILD_STRING "" +#define SM_BUILD_UNIQUEID "2481:c1fe549598cd" SM_BUILD_STRING +#define SVN_FULL_VERSION "1.1.2" SM_BUILD_STRING +#define SVN_FILE_VERSION 1,1,2,0 #endif //_INCLUDE_JIT_VERSION_H_ From c69989c56f26628575ed7dafc2e326f58d81a8fc Mon Sep 17 00:00:00 2001 From: Matt Woodrow Date: Thu, 26 Feb 2009 17:37:57 -0500 Subject: [PATCH 4/5] Added tag sourcemod-1.1.2 for changeset b3ffa8a4511c --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 27451cff..f6280ee3 100644 --- a/.hgtags +++ b/.hgtags @@ -1,3 +1,4 @@ 54539fa4e51f98d7841c853c1370dff6ccd3cdf2 sourcemod-1.0.0 e6ef5ecdf8d75740ca2685a709bf321f8873bc3b sourcemod-1.1.0 e877885fac80be71822641f7a9122cebc9812521 sourcemod-1.1.1 +b3ffa8a4511c4eadaf533fc790aa6b14f7f0c6ea sourcemod-1.1.2 From 71794fe51112b1b27bd35eabbb09ae39a49c5c92 Mon Sep 17 00:00:00 2001 From: Matt Woodrow Date: Thu, 26 Feb 2009 17:41:42 -0500 Subject: [PATCH 5/5] Updated branch for 1.1.3 development --- core/sm_version.h | 6 +++--- extensions/bintools/svn_version.h | 6 +++--- extensions/clientprefs/svn_version.h | 6 +++--- extensions/cstrike/svn_version.h | 6 +++--- extensions/geoip/svn_version.h | 6 +++--- extensions/mysql/svn_version.h | 6 +++--- extensions/regex/svn_version.h | 6 +++--- extensions/sdktools/svn_version.h | 6 +++--- extensions/sqlite/svn_version.h | 6 +++--- extensions/tf2/svn_version.h | 6 +++--- extensions/topmenus/svn_version.h | 6 +++--- loader/svn_version.h | 6 +++--- modules.versions | 2 +- plugins/include/version.inc | 4 ++-- product.version | 2 +- sourcepawn/compiler/svn_version.h | 6 +++--- sourcepawn/jit/jit_version.h | 6 +++--- tools/buildbot/bootstrap.pl | 2 +- 18 files changed, 47 insertions(+), 47 deletions(-) diff --git a/core/sm_version.h b/core/sm_version.h index a73bfa71..30c3d0ec 100644 --- a/core/sm_version.h +++ b/core/sm_version.h @@ -41,8 +41,8 @@ */ #define SM_BUILD_STRING "" -#define SM_BUILD_UNIQUEID "2481:c1fe549598cd" SM_BUILD_STRING -#define SVN_FULL_VERSION "1.1.2" SM_BUILD_STRING -#define SVN_FILE_VERSION 1,1,2,0 +#define SM_BUILD_UNIQUEID "2483:aeca4db15324" SM_BUILD_STRING +#define SVN_FULL_VERSION "1.1.3" SM_BUILD_STRING +#define SVN_FILE_VERSION 1,1,3,0 #endif //_INCLUDE_SOURCEMOD_VERSION_H_ diff --git a/extensions/bintools/svn_version.h b/extensions/bintools/svn_version.h index bb170b72..c866df32 100644 --- a/extensions/bintools/svn_version.h +++ b/extensions/bintools/svn_version.h @@ -37,8 +37,8 @@ #define _INCLUDE_BINTOOLS_VERSION_H_ #define SM_BUILD_STRING "" -#define SM_BUILD_UNIQUEID "2481:c1fe549598cd" SM_BUILD_STRING -#define SVN_FULL_VERSION "1.1.2" SM_BUILD_STRING -#define SVN_FILE_VERSION 1,1,2,0 +#define SM_BUILD_UNIQUEID "2483:aeca4db15324" SM_BUILD_STRING +#define SVN_FULL_VERSION "1.1.3" SM_BUILD_STRING +#define SVN_FILE_VERSION 1,1,3,0 #endif //_INCLUDE_BINTOOLS_VERSION_H_ diff --git a/extensions/clientprefs/svn_version.h b/extensions/clientprefs/svn_version.h index fb4960c0..a7f1e4fa 100644 --- a/extensions/clientprefs/svn_version.h +++ b/extensions/clientprefs/svn_version.h @@ -37,8 +37,8 @@ #define _INCLUDE_CLIENTPREFS_VERSION_H_ #define SM_BUILD_STRING "" -#define SM_BUILD_UNIQUEID "2481:c1fe549598cd" SM_BUILD_STRING -#define SVN_FULL_VERSION "1.1.2" SM_BUILD_STRING -#define SVN_FILE_VERSION 1,1,2,0 +#define SM_BUILD_UNIQUEID "2483:aeca4db15324" SM_BUILD_STRING +#define SVN_FULL_VERSION "1.1.3" SM_BUILD_STRING +#define SVN_FILE_VERSION 1,1,3,0 #endif //_INCLUDE_CLIENTPREFS_VERSION_H_ diff --git a/extensions/cstrike/svn_version.h b/extensions/cstrike/svn_version.h index 9c5a82ce..db89d511 100644 --- a/extensions/cstrike/svn_version.h +++ b/extensions/cstrike/svn_version.h @@ -37,8 +37,8 @@ #define _INCLUDE_SDKTOOLS_VERSION_H_ #define SM_BUILD_STRING "" -#define SM_BUILD_UNIQUEID "2481:c1fe549598cd" SM_BUILD_STRING -#define SVN_FULL_VERSION "1.1.2" SM_BUILD_STRING -#define SVN_FILE_VERSION 1,1,2,0 +#define SM_BUILD_UNIQUEID "2483:aeca4db15324" SM_BUILD_STRING +#define SVN_FULL_VERSION "1.1.3" SM_BUILD_STRING +#define SVN_FILE_VERSION 1,1,3,0 #endif //_INCLUDE_SDKTOOLS_VERSION_H_ diff --git a/extensions/geoip/svn_version.h b/extensions/geoip/svn_version.h index 57d9a1cf..3b56ac5b 100644 --- a/extensions/geoip/svn_version.h +++ b/extensions/geoip/svn_version.h @@ -37,8 +37,8 @@ #define _INCLUDE_GEOIP_VERSION_H_ #define SM_BUILD_STRING "" -#define SM_BUILD_UNIQUEID "2481:c1fe549598cd" SM_BUILD_STRING -#define SVN_FULL_VERSION "1.1.2" SM_BUILD_STRING -#define SVN_FILE_VERSION 1,1,2,0 +#define SM_BUILD_UNIQUEID "2483:aeca4db15324" SM_BUILD_STRING +#define SVN_FULL_VERSION "1.1.3" SM_BUILD_STRING +#define SVN_FILE_VERSION 1,1,3,0 #endif //_INCLUDE_GEOIP_VERSION_H_ diff --git a/extensions/mysql/svn_version.h b/extensions/mysql/svn_version.h index 2be6f344..e2f997eb 100644 --- a/extensions/mysql/svn_version.h +++ b/extensions/mysql/svn_version.h @@ -37,8 +37,8 @@ #define _INCLUDE_MYSQLEXT_VERSION_H_ #define SM_BUILD_STRING "" -#define SM_BUILD_UNIQUEID "2481:c1fe549598cd" SM_BUILD_STRING -#define SVN_FULL_VERSION "1.1.2" SM_BUILD_STRING -#define SVN_FILE_VERSION 1,1,2,0 +#define SM_BUILD_UNIQUEID "2483:aeca4db15324" SM_BUILD_STRING +#define SVN_FULL_VERSION "1.1.3" SM_BUILD_STRING +#define SVN_FILE_VERSION 1,1,3,0 #endif //_INCLUDE_MYSQLEXT_VERSION_H_ diff --git a/extensions/regex/svn_version.h b/extensions/regex/svn_version.h index 2dfe35d9..c2634b4d 100644 --- a/extensions/regex/svn_version.h +++ b/extensions/regex/svn_version.h @@ -37,8 +37,8 @@ #define _INCLUDE_REGEXEXT_VERSION_H_ #define SM_BUILD_STRING "" -#define SM_BUILD_UNIQUEID "2481:c1fe549598cd" SM_BUILD_STRING -#define SVN_FULL_VERSION "1.1.2" SM_BUILD_STRING -#define SVN_FILE_VERSION 1,1,2,0 +#define SM_BUILD_UNIQUEID "2483:aeca4db15324" SM_BUILD_STRING +#define SVN_FULL_VERSION "1.1.3" SM_BUILD_STRING +#define SVN_FILE_VERSION 1,1,3,0 #endif //_INCLUDE_REGEXEXT_VERSION_H_ diff --git a/extensions/sdktools/svn_version.h b/extensions/sdktools/svn_version.h index 96f036cd..f1772f5a 100644 --- a/extensions/sdktools/svn_version.h +++ b/extensions/sdktools/svn_version.h @@ -37,8 +37,8 @@ #define _INCLUDE_SDKTOOLS_VERSION_H_ #define SM_BUILD_STRING "" -#define SM_BUILD_UNIQUEID "2481:c1fe549598cd" SM_BUILD_STRING -#define SVN_FULL_VERSION "1.1.2" SM_BUILD_STRING -#define SVN_FILE_VERSION 1,1,2,0 +#define SM_BUILD_UNIQUEID "2483:aeca4db15324" SM_BUILD_STRING +#define SVN_FULL_VERSION "1.1.3" SM_BUILD_STRING +#define SVN_FILE_VERSION 1,1,3,0 #endif //_INCLUDE_SDKTOOLS_VERSION_H_ diff --git a/extensions/sqlite/svn_version.h b/extensions/sqlite/svn_version.h index b43a2dd3..5fc98d18 100644 --- a/extensions/sqlite/svn_version.h +++ b/extensions/sqlite/svn_version.h @@ -37,8 +37,8 @@ #define _INCLUDE_SQLITEEXT_VERSION_H_ #define SM_BUILD_STRING "" -#define SM_BUILD_UNIQUEID "2481:c1fe549598cd" SM_BUILD_STRING -#define SVN_FULL_VERSION "1.1.2" SM_BUILD_STRING -#define SVN_FILE_VERSION 1,1,2,0 +#define SM_BUILD_UNIQUEID "2483:aeca4db15324" SM_BUILD_STRING +#define SVN_FULL_VERSION "1.1.3" SM_BUILD_STRING +#define SVN_FILE_VERSION 1,1,3,0 #endif //_INCLUDE_SQLITEEXT_VERSION_H_ diff --git a/extensions/tf2/svn_version.h b/extensions/tf2/svn_version.h index 893382e9..59b1ec91 100644 --- a/extensions/tf2/svn_version.h +++ b/extensions/tf2/svn_version.h @@ -37,8 +37,8 @@ #define _INCLUDE_SDKTOOLS_VERSION_H_ #define SM_BUILD_STRING "" -#define SM_BUILD_UNIQUEID "2481:c1fe549598cd" SM_BUILD_STRING -#define SVN_FULL_VERSION "1.1.2" SM_BUILD_STRING -#define SVN_FILE_VERSION 1,1,2,0 +#define SM_BUILD_UNIQUEID "2483:aeca4db15324" SM_BUILD_STRING +#define SVN_FULL_VERSION "1.1.3" SM_BUILD_STRING +#define SVN_FILE_VERSION 1,1,3,0 #endif //_INCLUDE_SDKTOOLS_VERSION_H_ diff --git a/extensions/topmenus/svn_version.h b/extensions/topmenus/svn_version.h index 527ebf43..11f854bb 100644 --- a/extensions/topmenus/svn_version.h +++ b/extensions/topmenus/svn_version.h @@ -37,8 +37,8 @@ #define _INCLUDE_SQLITEEXT_VERSION_H_ #define SM_BUILD_STRING "" -#define SM_BUILD_UNIQUEID "2481:c1fe549598cd" SM_BUILD_STRING -#define SVN_FULL_VERSION "1.1.2" SM_BUILD_STRING -#define SVN_FILE_VERSION 1,1,2,0 +#define SM_BUILD_UNIQUEID "2483:aeca4db15324" SM_BUILD_STRING +#define SVN_FULL_VERSION "1.1.3" SM_BUILD_STRING +#define SVN_FILE_VERSION 1,1,3,0 #endif //_INCLUDE_SQLITEEXT_VERSION_H_ diff --git a/loader/svn_version.h b/loader/svn_version.h index a73bfa71..30c3d0ec 100644 --- a/loader/svn_version.h +++ b/loader/svn_version.h @@ -41,8 +41,8 @@ */ #define SM_BUILD_STRING "" -#define SM_BUILD_UNIQUEID "2481:c1fe549598cd" SM_BUILD_STRING -#define SVN_FULL_VERSION "1.1.2" SM_BUILD_STRING -#define SVN_FILE_VERSION 1,1,2,0 +#define SM_BUILD_UNIQUEID "2483:aeca4db15324" SM_BUILD_STRING +#define SVN_FULL_VERSION "1.1.3" SM_BUILD_STRING +#define SVN_FILE_VERSION 1,1,3,0 #endif //_INCLUDE_SOURCEMOD_VERSION_H_ diff --git a/modules.versions b/modules.versions index 73ea021d..cd738ede 100644 --- a/modules.versions +++ b/modules.versions @@ -1,7 +1,7 @@ [PRODUCT] major = 1 minor = 1 -revision = 2 +revision = 3 [core] folder = core diff --git a/plugins/include/version.inc b/plugins/include/version.inc index 22de2535..386213ed 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 1 /**< SourceMod Minor version */ -#define SOURCEMOD_V_RELEASE 2 /**< SourceMod Release version */ +#define SOURCEMOD_V_RELEASE 3 /**< SourceMod Release version */ -#define SOURCEMOD_VERSION "1.1.2" /**< SourceMod version string (major.minor.release.build) */ +#define SOURCEMOD_VERSION "1.1.3" /**< SourceMod version string (major.minor.release.build) */ diff --git a/product.version b/product.version index 45a1b3f4..781dcb07 100644 --- a/product.version +++ b/product.version @@ -1 +1 @@ -1.1.2 +1.1.3 diff --git a/sourcepawn/compiler/svn_version.h b/sourcepawn/compiler/svn_version.h index 702e29f1..4f1f5b44 100644 --- a/sourcepawn/compiler/svn_version.h +++ b/sourcepawn/compiler/svn_version.h @@ -20,8 +20,8 @@ */ #define SM_BUILD_STRING "" -#define SM_BUILD_UNIQUEID "2481:c1fe549598cd" SM_BUILD_STRING -#define SVN_FULL_VERSION "1.1.2" SM_BUILD_STRING -#define SVN_FILE_VERSION 1,1,2,0 +#define SM_BUILD_UNIQUEID "2483:aeca4db15324" SM_BUILD_STRING +#define SVN_FULL_VERSION "1.1.3" SM_BUILD_STRING +#define SVN_FILE_VERSION 1,1,3,0 #endif //_INCLUDE_SOURCEMOD_VERSION_H_ diff --git a/sourcepawn/jit/jit_version.h b/sourcepawn/jit/jit_version.h index 35274352..c3013f7f 100644 --- a/sourcepawn/jit/jit_version.h +++ b/sourcepawn/jit/jit_version.h @@ -33,8 +33,8 @@ #define _INCLUDE_JIT_VERSION_H_ #define SM_BUILD_STRING "" -#define SM_BUILD_UNIQUEID "2481:c1fe549598cd" SM_BUILD_STRING -#define SVN_FULL_VERSION "1.1.2" SM_BUILD_STRING -#define SVN_FILE_VERSION 1,1,2,0 +#define SM_BUILD_UNIQUEID "2483:aeca4db15324" SM_BUILD_STRING +#define SVN_FULL_VERSION "1.1.3" SM_BUILD_STRING +#define SVN_FILE_VERSION 1,1,3,0 #endif //_INCLUDE_JIT_VERSION_H_ diff --git a/tools/buildbot/bootstrap.pl b/tools/buildbot/bootstrap.pl index 0aaacf58..fc15c906 100755 --- a/tools/buildbot/bootstrap.pl +++ b/tools/buildbot/bootstrap.pl @@ -57,4 +57,4 @@ if ($^O eq "linux") Build::Command("flip -u tools/versionchanger.pl"); Build::Command("chmod +x tools/versionchanger.pl"); } -#Build::Command(Build::PathFormat('tools/versionchanger.pl') . ' --buildstring="-dev"'); +Build::Command(Build::PathFormat('tools/versionchanger.pl') . ' --buildstring="-dev"');