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

Fixed menu toggle restrictions, disabled group menu restrictions, next commit will have it done, fixed a bunch of compiler errors :P

Browse Source
This commit is contained in:
Greyscale 2009-04-13 22:00:37 +02:00
parent 5652202b28
commit 34d357a2c3
5 changed files with 139 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/zr/cvars.inc
View File

@ -263,7 +263,7 @@ LogFlagCheck(logtype, modulefilter = 0)
{ {
if (modulefilter && (logtype & LOG_MODULES_ENABLED)) if (modulefilter && (logtype & LOG_MODULES_ENABLED))
{ {
if (type & modulefilter) if (logtype & modulefilter)
{ {
return 1; return 1;
} }

60
src/zr/weapons/menu_weapons.inc
View File

@ -43,7 +43,7 @@ WeaponsMenuMain(client)
Format(zmarket, sizeof(zmarket), "%t", "Weapons menu main market"); Format(zmarket, sizeof(zmarket), "%t", "Weapons menu main market");
AddMenuItem(menu_weapons_main, "toggleweaponrestriction", toggleweaponrestriction); AddMenuItem(menu_weapons_main, "toggleweaponrestriction", toggleweaponrestriction);
AddMenuItem(menu_weapons_main, "togglewgrouprestriction", togglewgrouprestriction); AddMenuItem(menu_weapons_main, "togglewgrouprestriction", togglewgrouprestriction, ITEMDRAW_DISABLED);
// Disable market option if market isn't installed // Disable market option if market isn't installed
if (market) if (market)
@ -120,12 +120,15 @@ WeaponsMenuWeapons(client, WeaponsMenu:type)
SetGlobalTransTarget(client); SetGlobalTransTarget(client);
SetMenuTitle(menu_weapons_weapons, "%t\n ", "Weapons menu weapons title");
// If client wants to perform an action on a single weapon, show weapon list // If client wants to perform an action on a single weapon, show weapon list
if (curMenuWeapons[client] == Weapon) switch(curMenuWeapons[client])
{ {
case Weapon:
{
SetMenuTitle(menu_weapons_weapons, "%t\n ", "Weapons menu weapons weapon title");
decl String:weapon[WEAPONS_MAX_LENGTH]; decl String:weapon[WEAPONS_MAX_LENGTH];
decl String:display[WEAPONS_MAX_LENGTH + 1];
new Handle:arrayWeapons = INVALID_HANDLE; new Handle:arrayWeapons = INVALID_HANDLE;
new size = WeaponsCreateWeaponArray(arrayWeapons); new size = WeaponsCreateWeaponArray(arrayWeapons);
@ -136,19 +139,21 @@ WeaponsMenuWeapons(client, WeaponsMenu:type)
new bool:menu = WeaponsIsWeaponMenu(weapon); new bool:menu = WeaponsIsWeaponMenu(weapon);
strcopy(display, sizeof(display), weapon);
if (RestrictIsWeaponRestricted(weapon)) if (RestrictIsWeaponRestricted(weapon))
{ {
Format(weapon, sizeof(weapon), "%s*", weapon); Format(display, sizeof(display), "%s*", weapon);
} }
// If weapon restriction is blocked for the menu, disable option // If weapon restriction is blocked for the menu, disable option
if (menu) if (menu)
{ {
AddMenuItem(menu_weapons_weapons, weapon, weapon); AddMenuItem(menu_weapons_weapons, weapon, display);
} }
else else
{ {
AddMenuItem(menu_weapons_weapons, weapon, weapon, ITEMDRAW_DISABLED); AddMenuItem(menu_weapons_weapons, weapon, display, ITEMDRAW_DISABLED);
} }
} }
@ -156,9 +161,12 @@ WeaponsMenuWeapons(client, WeaponsMenu:type)
CloseHandle(arrayWeapons); CloseHandle(arrayWeapons);
} }
// If client wants to perform an action on a weapon group, show custom group list // If client wants to perform an action on a weapon group, show custom group list
else if (curMenuWeapons[client] == WeaponGroup) case WeaponGroup:
{ {
SetMenuTitle(menu_weapons_weapons, "%t\n ", "Weapons menu weapons group title");
decl String:weapongroup[WEAPONS_MAX_LENGTH]; decl String:weapongroup[WEAPONS_MAX_LENGTH];
decl String:display[WEAPONS_MAX_LENGTH + 1];
new Handle:arrayWeaponGroups = INVALID_HANDLE; new Handle:arrayWeaponGroups = INVALID_HANDLE;
new size = RestrictCreateGroupArray(arrayWeaponGroups); new size = RestrictCreateGroupArray(arrayWeaponGroups);
@ -167,18 +175,20 @@ WeaponsMenuWeapons(client, WeaponsMenu:type)
{ {
GetArrayString(arrayWeaponGroups, x, weapongroup, sizeof(weapongroup)); GetArrayString(arrayWeaponGroups, x, weapongroup, sizeof(weapongroup));
if (RestrictIsWeaponRestricted(weapongroup)) strcopy(display, sizeof(display), weapongroup);
if (RestrictIsGroupRestricted(weapongroup))
{ {
Format(weapongroup, sizeof(weapongroup), "%s*", weapongroup); Format(display, sizeof(display), "%s*", weapongroup);
} }
AddMenuItem(menu_weapons_weapons, weapongroup, weapongroup); AddMenuItem(menu_weapons_weapons, weapongroup, display);
} }
// Kill the array handle // Kill the array handle
CloseHandle(arrayWeaponGroups); CloseHandle(arrayWeaponGroups);
} }
}
SetMenuExitBackButton(menu_weapons_weapons, true); SetMenuExitBackButton(menu_weapons_weapons, true);
DisplayMenu(menu_weapons_weapons, client, MENU_TIME_FOREVER); DisplayMenu(menu_weapons_weapons, client, MENU_TIME_FOREVER);
@ -212,7 +222,7 @@ public WeaponsMenuWeaponsHandle(Handle:menu_weapons_weapons, MenuAction:action,
restrict = RestrictIsWeaponRestricted(weapon); restrict = RestrictIsWeaponRestricted(weapon);
} }
if (restrict) if (!restrict)
{ {
decl String:display[WEAPONS_MAX_LENGTH]; decl String:display[WEAPONS_MAX_LENGTH];
@ -222,29 +232,29 @@ public WeaponsMenuWeaponsHandle(Handle:menu_weapons_weapons, MenuAction:action,
{ {
case Successful_Weapon: case Successful_Weapon:
{ {
ZR_PrintToChat(0, "Restrict weapon", display); ZR_PrintToChat(0, "Restrict weapon", weapon);
} }
case Successful_Group: case Successful_Group:
{ {
decl String:weaponlist[128]; decl String:weaponlist[128];
RestrictGetGroupWeapons(display, weaponlist, sizeof(weaponlist), ", "); RestrictGetGroupWeapons(weapon, weaponlist, sizeof(weaponlist), ", ");
ZR_PrintToChat(0, "Restrict custom weapon group", display, weaponlist); ZR_PrintToChat(0, "Restrict custom weapon group", weapon, weaponlist);
} }
case Failed_Weapon: case Failed_Weapon:
{ {
ZR_PrintToChat(client, "Restrict weapon failed", display); ZR_PrintToChat(client, "Restrict weapon failed", weapon);
} }
case Failed_Group: case Failed_Group:
{ {
decl String:weaponlist[128]; decl String:weaponlist[128];
RestrictGetGroupWeapons(display, weaponlist, sizeof(weaponlist), ", "); RestrictGetGroupWeapons(weapon, weaponlist, sizeof(weaponlist), ", ");
ZR_PrintToChat(client, "Restrict custom weapon group failed", display, weaponlist); ZR_PrintToChat(client, "Restrict custom weapon group failed", weapon, weaponlist);
} }
case Invalid: case Invalid:
{ {
ZR_PrintToChat(client, "Weapon invalid", display); ZR_PrintToChat(client, "Weapon invalid", weapon);
} }
} }
} }
@ -258,22 +268,22 @@ public WeaponsMenuWeaponsHandle(Handle:menu_weapons_weapons, MenuAction:action,
{ {
case Successful_Weapon: case Successful_Weapon:
{ {
ZR_PrintToChat(0, "Unrestrict weapon", display); ZR_PrintToChat(0, "Unrestrict weapon", weapon);
} }
case Successful_Group: case Successful_Group:
{ {
decl String:weaponlist[128]; decl String:weaponlist[128];
RestrictGetGroupWeapons(display, weaponlist, sizeof(weaponlist), ", "); RestrictGetGroupWeapons(weapon, weaponlist, sizeof(weaponlist), ", ");
ZR_PrintToChat(0, "Unrestrict custom weapon group", display, weaponlist); ZR_PrintToChat(0, "Unrestrict custom weapon group", weapon, weaponlist);
} }
case Failed_Weapon: case Failed_Weapon:
{ {
ZR_PrintToChat(client, "Unrestrict weapon failed", display); ZR_PrintToChat(client, "Unrestrict weapon failed", weapon);
} }
case Invalid: case Invalid:
{ {
ZR_PrintToChat(client, "Weapon invalid", display); ZR_PrintToChat(client, "Weapon invalid", weapon);
} }
} }
} }

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

@ -222,6 +222,8 @@ WpnRestrictQuery:RestrictRestrict(const String:weapon[], String:display[])
return Successful_Group; return Successful_Group;
} }
WeaponGetDisplayName(weapon, display);
if (!WeaponsIsValidWeapon(weapon)) if (!WeaponsIsValidWeapon(weapon))
{ {
return Invalid; return Invalid;
@ -232,8 +234,6 @@ WpnRestrictQuery:RestrictRestrict(const String:weapon[], String:display[])
return Failed_Weapon; return Failed_Weapon;
} }
WeaponGetDisplayName(weapon, display);
PushArrayString(gRestrictedWeapons, display); PushArrayString(gRestrictedWeapons, display);
return Successful_Weapon; return Successful_Weapon;
@ -286,6 +286,8 @@ WpnRestrictQuery:RestrictUnrestrict(const String:weapon[], String:display[])
return Successful_Group; return Successful_Group;
} }
WeaponGetDisplayName(weapon, display);
if (!WeaponsIsValidWeapon(weapon)) if (!WeaponsIsValidWeapon(weapon))
{ {
return Invalid; return Invalid;
@ -296,8 +298,6 @@ WpnRestrictQuery:RestrictUnrestrict(const String:weapon[], String:display[])
return Failed_Weapon; return Failed_Weapon;
} }
WeaponGetDisplayName(weapon, display);
new weaponindex = RestrictGetIndex(display); new weaponindex = RestrictGetIndex(display);
if (weaponindex > -1) if (weaponindex > -1)
{ {
@ -330,7 +330,7 @@ bool:RestrictIsWeaponRestricted(const String:weapon[])
} }
/** /**
* Checks if a weapon group is restricted. * Checks if a weapon group is completely restricted.
* *
* @param weapongroup The weapon group name. * @param weapongroup The weapon group name.
*/ */
@ -357,6 +357,44 @@ bool:RestrictIsGroupRestricted(const String:weapongroup[])
return false; return false;
} }
/**
* Checks if a weapon group is completely unrestricted.
*
* @param weapongroup The weapon group name.
*/
bool:RestrictIsGroupUnrestricted(const String:weapongroup[])
{
KvRewind(kvWeaponGroups);
if (KvJumpToKey(kvWeaponGroups, weapongroup))
{
decl String:groupweapon[WEAPONS_MAX_LENGTH];
do
{
KvGetSectionName(kvWeaponGroups, groupweapon, WEAPONS_MAX_LENGTH);
if (RestrictIsWeaponRestricted(groupweapon))
{
return false;
}
} while (KvGotoNextKey(kvWeaponGroups));
return true;
}
return false;
}
/**
* Checks if a weapon group is partially restricted.
*
* @param weapongroup The weapon group name.
*/
bool:RestrictIsPartialRestricted(const String:weapongroup[])
{
return (!RestrictIsGroupRestricted(weapongroup) && !RestrictIsGroupUnrestricted(weapongroup));
}
/** /**
* Returns the array index of the restricted weapon. * Returns the array index of the restricted weapon.
* *

46
src/zr/zadmin.inc
View File

@ -498,7 +498,7 @@ ZRLogFlagsMenu(client)
SetMenuTitle(menu_log_flags, "%t\n ", "!zadmin log flags title"); SetMenuTitle(menu_log_flags, "%t\n ", "!zadmin log flags title");
new client_flags = GetUserFlagBits(client); new client_flags = GetUserFlagBits(client);
new item_disabled = (client_flags & ADMFLAG_ROOT) ? ITEMDRAW_DEFAULT : ITEMDRAW_DISABLED; new item_state = (client_flags & ADMFLAG_ROOT) ? ITEMDRAW_DEFAULT : ITEMDRAW_DISABLED;
decl String:z_log_core[64]; decl String:z_log_core[64];
decl String:z_log_game[64]; decl String:z_log_game[64];
@ -516,7 +516,7 @@ ZRLogFlagsMenu(client)
decl String:z_log_module_saytriggers[64]; decl String:z_log_module_saytriggers[64];
decl String:z_log_module_teleport[64]; decl String:z_log_module_teleport[64];
decl String:z_log_module_classes[64]; decl String:z_log_module_classes[64];
decl String:z_log_module_weaponrestrict[64]; decl String:z_log_module_weapons[64];
decl String:z_log_module_commands[64]; decl String:z_log_module_commands[64];
decl String:z_log_module_anticamp[64]; decl String:z_log_module_anticamp[64];
decl String:z_log_module_damagecontrol[64]; decl String:z_log_module_damagecontrol[64];
@ -538,33 +538,33 @@ ZRLogFlagsMenu(client)
Format(z_log_module_saytriggers, sizeof(z_log_module_saytriggers), "Chat commands (%d)", LogHasFlag(LOG_MODULE_SAYTRIGGERS)); Format(z_log_module_saytriggers, sizeof(z_log_module_saytriggers), "Chat commands (%d)", LogHasFlag(LOG_MODULE_SAYTRIGGERS));
Format(z_log_module_teleport, sizeof(z_log_module_teleport), "Teleporter (%d)", LogHasFlag(LOG_MODULE_TELEPORT)); Format(z_log_module_teleport, sizeof(z_log_module_teleport), "Teleporter (%d)", LogHasFlag(LOG_MODULE_TELEPORT));
Format(z_log_module_classes, sizeof(z_log_module_classes), "Classes (%d)", LogHasFlag(LOG_MODULE_CLASSES)); Format(z_log_module_classes, sizeof(z_log_module_classes), "Classes (%d)", LogHasFlag(LOG_MODULE_CLASSES));
Format(z_log_module_weaponrestrict, sizeof(z_log_module_weaponrestrict), "Weapon restrictions (%d)", LogHasFlag(LOG_MODULE_WEAPONRESTICT)); Format(z_log_module_weapons, sizeof(z_log_module_weapons), "Weapons (%d)", LogHasFlag(LOG_MODULE_WEAPONS));
Format(z_log_module_commands, sizeof(z_log_module_commands), "Admin commands (%d)", LogHasFlag(LOG_MODULE_COMMANDS)); Format(z_log_module_commands, sizeof(z_log_module_commands), "Admin commands (%d)", LogHasFlag(LOG_MODULE_COMMANDS));
Format(z_log_module_anticamp, sizeof(z_log_module_anticamp), "Anticamp (%d)", LogHasFlag(LOG_MODULE_ANTICAMP)); Format(z_log_module_anticamp, sizeof(z_log_module_anticamp), "Anticamp (%d)", LogHasFlag(LOG_MODULE_ANTICAMP));
Format(z_log_module_damagecontrol, sizeof(z_log_module_damagecontrol), "Damage control (suicides) (%d)", LogHasFlag(LOG_MODULE_DAMAGECONTROL)); Format(z_log_module_damagecontrol, sizeof(z_log_module_damagecontrol), "Damage control (suicides) (%d)", LogHasFlag(LOG_MODULE_DAMAGECONTROL));
Format(z_log_module_offsets, sizeof(z_log_module_offsets), "Offsets (properties) (%d)", LogHasFlag(LOG_MODULE_OFFSETS)); Format(z_log_module_offsets, sizeof(z_log_module_offsets), "Offsets (properties) (%d)", LogHasFlag(LOG_MODULE_OFFSETS));
AddMenuItem(menu_log_flags, z_log_core, z_log_core, item_disabled); AddMenuItem(menu_log_flags, z_log_core, z_log_core, item_state);
AddMenuItem(menu_log_flags, z_log_game, z_log_game, item_disabled); AddMenuItem(menu_log_flags, z_log_game, z_log_game, item_state);
AddMenuItem(menu_log_flags, z_log_player, z_log_player, item_disabled); AddMenuItem(menu_log_flags, z_log_player, z_log_player, item_state);
AddMenuItem(menu_log_flags, z_log_debug, z_log_debug, item_disabled); AddMenuItem(menu_log_flags, z_log_debug, z_log_debug, item_state);
AddMenuItem(menu_log_flags, z_log_debug_detail, z_log_debug_detail, item_disabled); AddMenuItem(menu_log_flags, z_log_debug_detail, z_log_debug_detail, item_state);
AddMenuItem(menu_log_flags, z_log_debug_max, z_log_debug_max, item_disabled); AddMenuItem(menu_log_flags, z_log_debug_max, z_log_debug_max, item_state);
AddMenuItem(menu_log_flags, z_log_admins, z_log_admins); AddMenuItem(menu_log_flags, z_log_admins, z_log_admins);
AddMenuItem(menu_log_flags, z_log_client, z_log_client); AddMenuItem(menu_log_flags, z_log_client, z_log_client);
AddMenuItem(menu_log_flags, z_log_ignore_console, z_log_ignore_console, item_disabled); AddMenuItem(menu_log_flags, z_log_ignore_console, z_log_ignore_console, item_state);
AddMenuItem(menu_log_flags, z_log_modules_enabled, z_log_modules_enabled, item_disabled); AddMenuItem(menu_log_flags, z_log_modules_enabled, z_log_modules_enabled, item_state);
AddMenuItem(menu_log_flags, z_log_module_zombie, z_log_module_zombie, item_disabled); AddMenuItem(menu_log_flags, z_log_module_zombie, z_log_module_zombie, item_state);
AddMenuItem(menu_log_flags, z_log_module_ambience, z_log_module_ambience, item_disabled); AddMenuItem(menu_log_flags, z_log_module_ambience, z_log_module_ambience, item_state);
AddMenuItem(menu_log_flags, z_log_module_overlays, z_log_module_overlays, item_disabled); AddMenuItem(menu_log_flags, z_log_module_overlays, z_log_module_overlays, item_state);
AddMenuItem(menu_log_flags, z_log_module_saytriggers, z_log_module_saytriggers, item_disabled); AddMenuItem(menu_log_flags, z_log_module_saytriggers, z_log_module_saytriggers, item_state);
AddMenuItem(menu_log_flags, z_log_module_teleport, z_log_module_teleport, item_disabled); AddMenuItem(menu_log_flags, z_log_module_teleport, z_log_module_teleport, item_state);
AddMenuItem(menu_log_flags, z_log_module_classes, z_log_module_classes, item_disabled); AddMenuItem(menu_log_flags, z_log_module_classes, z_log_module_classes, item_state);
AddMenuItem(menu_log_flags, z_log_module_weaponrestrict, z_log_module_weaponrestrict, item_disabled); AddMenuItem(menu_log_flags, z_log_module_weapons, z_log_module_weapons, item_state);
AddMenuItem(menu_log_flags, z_log_module_commands, z_log_module_commands, item_disabled); AddMenuItem(menu_log_flags, z_log_module_commands, z_log_module_commands, item_state);
AddMenuItem(menu_log_flags, z_log_module_anticamp, z_log_module_anticamp, item_disabled); AddMenuItem(menu_log_flags, z_log_module_anticamp, z_log_module_anticamp, item_state);
AddMenuItem(menu_log_flags, z_log_module_damagecontrol, z_log_module_damagecontrol, item_disabled); AddMenuItem(menu_log_flags, z_log_module_damagecontrol, z_log_module_damagecontrol, item_state);
AddMenuItem(menu_log_flags, z_log_module_offsets, z_log_module_offsets, item_disabled); AddMenuItem(menu_log_flags, z_log_module_offsets, z_log_module_offsets, item_state);
SetMenuExitBackButton(menu_log_flags, true); SetMenuExitBackButton(menu_log_flags, true);
DisplayMenu(menu_log_flags, client, MENU_TIME_FOREVER); DisplayMenu(menu_log_flags, client, MENU_TIME_FOREVER);
@ -658,7 +658,7 @@ public ZRLogFlagsMenuHandle(Handle:menu_log_flags , MenuAction:action, client, s
} }
case 16: case 16:
{ {
ToggleLogFlag(LOG_MODULE_WEAPONRESTICT); ToggleLogFlag(LOG_MODULE_WEAPONS);
ZRLogFlagsMenu(client); ZRLogFlagsMenu(client);
} }
case 17: case 17:

7
src/zr/zombiereloaded.inc
View File

@ -55,10 +55,9 @@ enum ZTeam
#define LOG_MODULE_OVERLAYS 65536 /** overlays.inc */ #define LOG_MODULE_OVERLAYS 65536 /** overlays.inc */
#define LOG_MODULE_TELEPORT 131072 /** teleport.inc */ #define LOG_MODULE_TELEPORT 131072 /** teleport.inc */
#define LOG_MODULE_WEAPONS 262144 /** Weapons module - weapons/ *.inc */ #define LOG_MODULE_WEAPONS 262144 /** Weapons module - weapons/ *.inc */
#define LOG_MODULE_COMMANDS 524288 /** commands.inc */ #define LOG_MODULE_ANTICAMP 524288 /** anticamp.inc */
#define LOG_MODULE_ANTICAMP 1048576 /** anticamp.inc */ #define LOG_MODULE_DAMAGECONTROL 1048576 /** damagecontrol.inc */
#define LOG_MODULE_DAMAGECONTROL 2097152 /** damagecontrol.inc */ #define LOG_MODULE_OFFSETS 2097152 /** offsets.inc */
#define LOG_MODULE_OFFSETS 4194304 /** offsets.inc */
/* /*
* @endsection * @endsection
*/ */