CSSZombieEscape/sm-zombiereloaded-3
7
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Separated weapon entity and weapon name. Broke config compatibility in weapons.txt. Either update yours by hand, or overwrite with this file.

Browse Source 
Made support for my Grenade Pack plugin, just install the plugin and ZMarket will follow gp_limit.  The only problem right now is flash/smoke are treated like grenades, this will be fixed soon.
This commit is contained in:
Greyscale
2009-08-25 13:07:10 -07:00
parent f804a7d4e2
commit dedb782e28
6 changed files with 296 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/zr/weapons/restrict.inc
View File

@ -240,26 +240,21 @@ public Action:RestrictBuyCommand(client, argc)
decl String:weapon[WEAPONS_MAX_LENGTH];
GetCmdArg(1, weapon, sizeof(weapon));
ReplaceString(weapon, sizeof(weapon), "weapon_", "");
// If the weapon is restricted, then prevent pickup.
new index = WeaponsNameToIndex(weapon);
decl String:weaponname[WEAPONS_MAX_LENGTH];
new weaponindex = WeaponsEntityToDisplay(weapon, weaponname, sizeof(weaponname), true);
// If weapon isn't configged, then allow pickup.
if (index == -1)
if (weaponindex == -1)
{
// Allow command.
return Plugin_Continue;
}
// If weapon is restricted, then stop.
if (RestrictIsWeaponRestricted(index))
if (RestrictIsWeaponRestricted(weaponindex))
{
// Get display name.
decl String:weapondisplay[WEAPONS_MAX_LENGTH];
WeaponsGetName(index, weapondisplay, sizeof(weapondisplay));
TranslationPrintToChat(client, "Weapon is restricted", weapondisplay);
TranslationPrintToChat(client, "Weapon is restricted", weaponname);
// Block command.
return Plugin_Handled;
@ -284,9 +279,6 @@ RestrictQuery:RestrictWeapon(bool:restrict, const String:target[], &bool:single
// Copy 'target' to 'returntarget' to be possibly changed later.
strcopy(returntarget, maxlen, target);
// Strip "weapon_" from target.
ReplaceString(returntarget, maxlen, "weapon_", "");
// Find index of the given weapon type.
new typeindex = RestrictTypeToIndex(returntarget);
@ -593,14 +585,11 @@ stock bool:RestrictIsTypeUniform(bool:restricted, index)
*/
public ZRTools_Action:RestrictCanUse(client, weapon)
{
new String:weaponname[WEAPONS_MAX_LENGTH];
GetEdictClassname(weapon, weaponname, sizeof(weaponname));
// Strip "weapon_" from entity name.
ReplaceString(weaponname, sizeof(weaponname), "weapon_", "");
new String:weaponentity[WEAPONS_MAX_LENGTH];
GetEdictClassname(weapon, weaponentity, sizeof(weaponentity));
// If weapon is a knife, then allow pickup.
if (StrEqual(weaponname, "knife"))
if (StrEqual(weaponentity, "weapon_knife"))
{
return ZRTools_Continue;
}
@ -632,17 +621,18 @@ public ZRTools_Action:RestrictCanUse(client, weapon)
}
// If the weapon is restricted, then prevent pickup.
new index = WeaponsNameToIndex(weaponname);
decl String:weaponname[WEAPONS_MAX_LENGTH];
new weaponindex = WeaponsEntityToDisplay(weaponentity, weaponname, sizeof(weaponname));
// If weapon isn't configged, then allow pickup.
if (index == -1)
if (weaponindex == -1)
{
// Allow pickup.
return ZRTools_Continue;
}
// If weapon is restricted, then stop.
if (RestrictIsWeaponRestricted(index))
if (RestrictIsWeaponRestricted(weaponindex))
{
return ZRTools_Handled;
}