From 8ad1cb0b8c6651000431ba40ef97d4e8a9b57c08 Mon Sep 17 00:00:00 2001 From: Scott Ehlert Date: Sat, 31 May 2008 22:30:57 +0000 Subject: [PATCH] Removed TF2_GivePlayerWeapon() and TF2_EquipPlayerClassWeapons() stocks as they no longer work at all The 'weapons' paramater in the TF2_SetPlayerClass() class is now ignored since it no longer works Bumped 1.0.2 versions for the final time --HG-- branch : sourcemod-1.0.x extra : convert_revision : svn%3A39bc706e-5318-0410-9160-8a85361fbb7c/branches/sourcemod-1.0.x%402236 --- core/sm_version.h | 4 +- extensions/bintools/svn_version.h | 4 +- extensions/cstrike/svn_version.h | 4 +- extensions/geoip/svn_version.h | 4 +- extensions/mysql/svn_version.h | 4 +- extensions/regex/svn_version.h | 4 +- extensions/sdktools/svn_version.h | 4 +- extensions/sqlite/svn_version.h | 4 +- extensions/tf2/svn_version.h | 4 +- extensions/topmenus/svn_version.h | 4 +- loader/svn_version.h | 4 +- plugins/include/tf2_stocks.inc | 110 +----------------------------- plugins/include/version.inc | 2 +- 13 files changed, 24 insertions(+), 132 deletions(-) diff --git a/core/sm_version.h b/core/sm_version.h index 5ec4ebf3..52b14a97 100644 --- a/core/sm_version.h +++ b/core/sm_version.h @@ -40,7 +40,7 @@ * @file Contains SourceMod version information. */ -#define SVN_FULL_VERSION "1.0.2.2232" -#define SVN_FILE_VERSION 1,0,2,2232 +#define SVN_FULL_VERSION "1.0.2.2236" +#define SVN_FILE_VERSION 1,0,2,2236 #endif //_INCLUDE_SOURCEMOD_VERSION_H_ diff --git a/extensions/bintools/svn_version.h b/extensions/bintools/svn_version.h index 5f19d468..e6f85f16 100644 --- a/extensions/bintools/svn_version.h +++ b/extensions/bintools/svn_version.h @@ -36,7 +36,7 @@ #ifndef _INCLUDE_BINTOOLS_VERSION_H_ #define _INCLUDE_BINTOOLS_VERSION_H_ -#define SVN_FULL_VERSION "1.0.2.2232" -#define SVN_FILE_VERSION 1,0,2,2232 +#define SVN_FULL_VERSION "1.0.2.2236" +#define SVN_FILE_VERSION 1,0,2,2236 #endif //_INCLUDE_BINTOOLS_VERSION_H_ diff --git a/extensions/cstrike/svn_version.h b/extensions/cstrike/svn_version.h index 6470b6cc..a6ae142a 100644 --- a/extensions/cstrike/svn_version.h +++ b/extensions/cstrike/svn_version.h @@ -36,7 +36,7 @@ #ifndef _INCLUDE_SDKTOOLS_VERSION_H_ #define _INCLUDE_SDKTOOLS_VERSION_H_ -#define SVN_FULL_VERSION "1.0.2.2232" -#define SVN_FILE_VERSION 1,0,2,2232 +#define SVN_FULL_VERSION "1.0.2.2236" +#define SVN_FILE_VERSION 1,0,2,2236 #endif //_INCLUDE_SDKTOOLS_VERSION_H_ diff --git a/extensions/geoip/svn_version.h b/extensions/geoip/svn_version.h index 2bdac845..c0b86a5d 100644 --- a/extensions/geoip/svn_version.h +++ b/extensions/geoip/svn_version.h @@ -36,7 +36,7 @@ #ifndef _INCLUDE_GEOIP_VERSION_H_ #define _INCLUDE_GEOIP_VERSION_H_ -#define SVN_FULL_VERSION "1.0.2.2232" -#define SVN_FILE_VERSION 1,0,2,2232 +#define SVN_FULL_VERSION "1.0.2.2236" +#define SVN_FILE_VERSION 1,0,2,2236 #endif //_INCLUDE_GEOIP_VERSION_H_ diff --git a/extensions/mysql/svn_version.h b/extensions/mysql/svn_version.h index 20b5b447..f3190a0a 100644 --- a/extensions/mysql/svn_version.h +++ b/extensions/mysql/svn_version.h @@ -36,7 +36,7 @@ #ifndef _INCLUDE_MYSQLEXT_VERSION_H_ #define _INCLUDE_MYSQLEXT_VERSION_H_ -#define SVN_FULL_VERSION "1.0.2.2232" -#define SVN_FILE_VERSION 1,0,2,2232 +#define SVN_FULL_VERSION "1.0.2.2236" +#define SVN_FILE_VERSION 1,0,2,2236 #endif //_INCLUDE_MYSQLEXT_VERSION_H_ diff --git a/extensions/regex/svn_version.h b/extensions/regex/svn_version.h index eaa52624..90a74046 100644 --- a/extensions/regex/svn_version.h +++ b/extensions/regex/svn_version.h @@ -36,7 +36,7 @@ #ifndef _INCLUDE_REGEXEXT_VERSION_H_ #define _INCLUDE_REGEXEXT_VERSION_H_ -#define SVN_FULL_VERSION "1.0.2.2232" -#define SVN_FILE_VERSION 1,0,2,2232 +#define SVN_FULL_VERSION "1.0.2.2236" +#define SVN_FILE_VERSION 1,0,2,2236 #endif //_INCLUDE_REGEXEXT_VERSION_H_ diff --git a/extensions/sdktools/svn_version.h b/extensions/sdktools/svn_version.h index 695469ff..4683735f 100644 --- a/extensions/sdktools/svn_version.h +++ b/extensions/sdktools/svn_version.h @@ -36,7 +36,7 @@ #ifndef _INCLUDE_SDKTOOLS_VERSION_H_ #define _INCLUDE_SDKTOOLS_VERSION_H_ -#define SVN_FULL_VERSION "1.0.2.2232" -#define SVN_FILE_VERSION 1,0,2,2232 +#define SVN_FULL_VERSION "1.0.2.2236" +#define SVN_FILE_VERSION 1,0,2,2236 #endif //_INCLUDE_SDKTOOLS_VERSION_H_ diff --git a/extensions/sqlite/svn_version.h b/extensions/sqlite/svn_version.h index 56bb5626..2f6c2771 100644 --- a/extensions/sqlite/svn_version.h +++ b/extensions/sqlite/svn_version.h @@ -36,7 +36,7 @@ #ifndef _INCLUDE_SQLITEEXT_VERSION_H_ #define _INCLUDE_SQLITEEXT_VERSION_H_ -#define SVN_FULL_VERSION "1.0.2.2232" -#define SVN_FILE_VERSION 1,0,2,2232 +#define SVN_FULL_VERSION "1.0.2.2236" +#define SVN_FILE_VERSION 1,0,2,2236 #endif //_INCLUDE_SQLITEEXT_VERSION_H_ diff --git a/extensions/tf2/svn_version.h b/extensions/tf2/svn_version.h index 9093d94e..dd99bfe8 100644 --- a/extensions/tf2/svn_version.h +++ b/extensions/tf2/svn_version.h @@ -36,7 +36,7 @@ #ifndef _INCLUDE_SDKTOOLS_VERSION_H_ #define _INCLUDE_SDKTOOLS_VERSION_H_ -#define SVN_FULL_VERSION "1.0.2.2232" -#define SVN_FILE_VERSION 1,0,2,2232 +#define SVN_FULL_VERSION "1.0.2.2236" +#define SVN_FILE_VERSION 1,0,2,2236 #endif //_INCLUDE_SDKTOOLS_VERSION_H_ diff --git a/extensions/topmenus/svn_version.h b/extensions/topmenus/svn_version.h index b3053101..0e60052b 100644 --- a/extensions/topmenus/svn_version.h +++ b/extensions/topmenus/svn_version.h @@ -36,7 +36,7 @@ #ifndef _INCLUDE_SQLITEEXT_VERSION_H_ #define _INCLUDE_SQLITEEXT_VERSION_H_ -#define SVN_FULL_VERSION "1.0.2.2232" -#define SVN_FILE_VERSION 1,0,2,2232 +#define SVN_FULL_VERSION "1.0.2.2236" +#define SVN_FILE_VERSION 1,0,2,2236 #endif //_INCLUDE_SQLITEEXT_VERSION_H_ diff --git a/loader/svn_version.h b/loader/svn_version.h index 5ec4ebf3..52b14a97 100644 --- a/loader/svn_version.h +++ b/loader/svn_version.h @@ -40,7 +40,7 @@ * @file Contains SourceMod version information. */ -#define SVN_FULL_VERSION "1.0.2.2232" -#define SVN_FILE_VERSION 1,0,2,2232 +#define SVN_FULL_VERSION "1.0.2.2236" +#define SVN_FILE_VERSION 1,0,2,2236 #endif //_INCLUDE_SOURCEMOD_VERSION_H_ diff --git a/plugins/include/tf2_stocks.inc b/plugins/include/tf2_stocks.inc index 219f0734..4f5872c0 100644 --- a/plugins/include/tf2_stocks.inc +++ b/plugins/include/tf2_stocks.inc @@ -102,7 +102,7 @@ stock TFClassType:TF2_GetPlayerClass(client) * * @param client Player's index. * @param class TFClassType class symbol. - * @param weapons If true, changes the players weapon set to that of the new class. + * @param weapons This paramater is ignored. * @param persistant If true changes the players desired class so the change stays after death. * @noreturn * @error Invalid client index. @@ -115,12 +115,6 @@ stock TF2_SetPlayerClass(client, TFClassType:class, bool:weapons=true, bool:pers { SetEntProp(client, Prop_Send, "m_iDesiredPlayerClass", _:class); } - - if (weapons && IsPlayerAlive(client)) - { - TF2_RemoveAllWeapons(client); - TF2_EquipPlayerClassWeapons(client, class); - } } /** @@ -223,105 +217,3 @@ stock TF2_RemoveAllWeapons(client) TF2_RemoveWeaponSlot(client, i); } } - -/** - * Gives a named weapon to a client - * - * @param client Player's index. - * @param weapon Weapon name - * @return False if weapon could not be created, true on success - * @error Invalid client index or lack of mod support - */ -stock bool:TF2_GivePlayerWeapon(client, const String:weapon[]) -{ - new weaponIndex = GivePlayerItem(client, weapon); - if (weaponIndex == -1) - { - return false; - } - - EquipPlayerWeapon(client, weaponIndex); - - return true; -} - -/** - * Equips a client with a class's weapons. This does not remove existing weapons. - * - * Note: Some class specific items such tf_weapon_pda_engineer_build are only given - * if the client is the correct class. - * - * @param client Player's index. - * @param class TFClasssType class symbol. - * @noreturn - */ -stock TF2_EquipPlayerClassWeapons(client, TFClassType:class) -{ - switch(class) - { - case TFClass_Scout: - { - TF2_GivePlayerWeapon(client, "tf_weapon_scattergun"); - TF2_GivePlayerWeapon(client, "tf_weapon_pistol_scout"); - TF2_GivePlayerWeapon(client, "tf_weapon_bat"); - } - case TFClass_Sniper: - { - TF2_GivePlayerWeapon(client, "tf_weapon_sniperrifle"); - TF2_GivePlayerWeapon(client, "tf_weapon_smg"); - TF2_GivePlayerWeapon(client, "tf_weapon_club"); - } - case TFClass_Soldier: - { - TF2_GivePlayerWeapon(client, "tf_weapon_rocketlauncher"); - TF2_GivePlayerWeapon(client, "tf_weapon_shotgun_soldier"); - TF2_GivePlayerWeapon(client, "tf_weapon_shovel"); - } - case TFClass_DemoMan: - { - TF2_GivePlayerWeapon(client, "tf_weapon_pipebomblauncher"); - TF2_GivePlayerWeapon(client, "tf_weapon_grenadelauncher"); - TF2_GivePlayerWeapon(client, "tf_weapon_bottle"); - } - case TFClass_Medic: - { - TF2_GivePlayerWeapon(client, "tf_weapon_syringegun_medic"); - TF2_GivePlayerWeapon(client, "tf_weapon_medigun"); - TF2_GivePlayerWeapon(client, "tf_weapon_bonesaw"); - } - case TFClass_Heavy: - { - TF2_GivePlayerWeapon(client, "tf_weapon_minigun"); - TF2_GivePlayerWeapon(client, "tf_weapon_shotgun_hwg"); - TF2_GivePlayerWeapon(client, "tf_weapon_fists"); - } - case TFClass_Pyro: - { - TF2_GivePlayerWeapon(client, "tf_weapon_flamethrower"); - TF2_GivePlayerWeapon(client, "tf_weapon_shotgun_pyro"); - TF2_GivePlayerWeapon(client, "tf_weapon_fireaxe"); - } - case TFClass_Spy: - { - TF2_GivePlayerWeapon(client, "tf_weapon_revolver"); - TF2_GivePlayerWeapon(client, "tf_weapon_knife"); - - if (TF2_GetPlayerClass(client) != TFClass_Spy) - return; - - TF2_GivePlayerWeapon(client, "tf_weapon_pda_spy"); - } - case TFClass_Engineer: - { - TF2_GivePlayerWeapon(client, "tf_weapon_shotgun_primary"); - TF2_GivePlayerWeapon(client, "tf_weapon_pistol"); - TF2_GivePlayerWeapon(client, "tf_weapon_wrench"); - - if (TF2_GetPlayerClass(client) != TFClass_Engineer) - return; - - TF2_GivePlayerWeapon(client, "tf_weapon_pda_engineer_build"); - TF2_GivePlayerWeapon(client, "tf_weapon_pda_engineer_destroy"); - } - } -} \ No newline at end of file diff --git a/plugins/include/version.inc b/plugins/include/version.inc index 90273217..699f0561 100644 --- a/plugins/include/version.inc +++ b/plugins/include/version.inc @@ -39,4 +39,4 @@ #define SOURCEMOD_V_MINOR 0 /**< SourceMod Minor version */ #define SOURCEMOD_V_RELEASE 2 /**< SourceMod Release version */ -#define SOURCEMOD_VERSION "1.0.2.2232" /**< SourceMod version string (major.minor.release.build) */ +#define SOURCEMOD_VERSION "1.0.2.2236" /**< SourceMod version string (major.minor.release.build) */