From 37c9929bd49b4e05caea0de740cf67fc45bf4f96 Mon Sep 17 00:00:00 2001 From: richard Date: Mon, 30 Nov 2009 16:49:11 +0100 Subject: [PATCH] Code cleanup in class overlays. --- src/zr/cvars.inc | 2 +- src/zr/playerclasses/clientoverlays.inc | 19 +++++++------------ 2 files changed, 8 insertions(+), 13 deletions(-) diff --git a/src/zr/cvars.inc b/src/zr/cvars.inc index a3cb292..1c4d342 100644 --- a/src/zr/cvars.inc +++ b/src/zr/cvars.inc @@ -275,7 +275,7 @@ CvarsCreate() // Overlays g_hCvarsList[CVAR_CLASSES_OVERLAY_TOGGLE] = CreateConVar("zr_classes_overlay_toggle", "1", "Allow players to toggle class overlay."); - g_hCvarsList[CVAR_CLASSES_OVERLAY_TOGGLECMDS] = CreateConVar("zr_classes_overlay_togglecmds", "nightvision", "List of commands to hook that players can use to toggle class overlay. [Dependency: zr_classes_overlay_toggle | Delimiter: \", \"]"); + g_hCvarsList[CVAR_CLASSES_OVERLAY_TOGGLECMDS] = CreateConVar("zr_classes_overlay_togglecmds", "nightvision", "List of commands to hook that players can use to toggle class overlay. [Dependency: zr_classes_overlay_toggle | Delimiter: \",\"]"); g_hCvarsList[CVAR_CLASSES_OVERLAY_DEFAULT] = CreateConVar("zr_classes_overlay_default", "1", "Default class overlay toggle state set on connecting player."); diff --git a/src/zr/playerclasses/clientoverlays.inc b/src/zr/playerclasses/clientoverlays.inc index 8f805d9..47a56aa 100644 --- a/src/zr/playerclasses/clientoverlays.inc +++ b/src/zr/playerclasses/clientoverlays.inc @@ -45,29 +45,24 @@ new Handle:g_hOverlayEnabledCookie = INVALID_HANDLE; /** - * Hook commands related to overlay here. + * Creates command clallbacks for listed overlay commands. */ ClassOverlayOnCommandsHook() { - // Create command callbacks (intercepts) for listed suicide commands. decl String:togglecmds[CLASSOVERLAY_TOGGLE_MAX_CMDS * CLASSOVERLAY_TOGGLE_MAX_LENGTH]; GetConVarString(g_hCvarsList[CVAR_CLASSES_OVERLAY_TOGGLECMDS], togglecmds, sizeof(togglecmds)); - // Create array to store cmds + // Array to store commands. new String:arrayCmds[CLASSOVERLAY_TOGGLE_MAX_CMDS][CLASSOVERLAY_TOGGLE_MAX_LENGTH]; - // Explode string into array indexes. + // Put the commands into an array. new cmdcount = ExplodeString(togglecmds, ",", arrayCmds, sizeof(arrayCmds), sizeof(arrayCmds[])); - // x = Array index. - // arrayCmds[x] = suicide command. - for (new x = 0; x <= cmdcount - 1; x++) + // Register all overlay commands. + for (new i = 0; i < cmdcount; i++) { - // Trim whitespace. - TrimString(arrayCmds[x]); - - // Prepare intercept for this command. - RegConsoleCmd(arrayCmds[x], ClassOverlayEnableCommand); + TrimString(arrayCmds[i]); + RegConsoleCmd(arrayCmds[i], ClassOverlayEnableCommand); } }