From a0d8209c6aa3fa73675dedc47d6e1d3b5ee457d3 Mon Sep 17 00:00:00 2001 From: richard Date: Mon, 22 Jun 2009 16:29:13 +0200 Subject: [PATCH] Minior fixes in class system. --- src/zr/cvars.inc | 2 +- src/zr/playerclasses/classevents.inc | 8 ++++---- src/zr/playerclasses/filtertools.inc | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/zr/cvars.inc b/src/zr/cvars.inc index f7d9032..b547009 100644 --- a/src/zr/cvars.inc +++ b/src/zr/cvars.inc @@ -238,7 +238,7 @@ CvarsCreate() g_hCvarsList[CVAR_CLASSES_DEFAULT_ADMIN] = CreateConVar("zr_classes_default_admin", "random", "Admin class assigned to admins on connect. [\"random\" = Random admin class | \"\" = Class config default]"); // Menu - g_hCvarsList[CVAR_CLASSES_MENU_AUTOCLOSE] = CreateConVar("zr_classes_menu_autoclose", "0", "Automatically close class selection menu."); + g_hCvarsList[CVAR_CLASSES_MENU_AUTOCLOSE] = CreateConVar("zr_classes_menu_autoclose", "0", "Automatically close class selection menu after selecting a class."); // Overlays g_hCvarsList[CVAR_CLASSES_OVERLAY_TOGGLE] = CreateConVar("zr_classes_overlay_toggle", "1", "Allow players to toggle class overlay."); diff --git a/src/zr/playerclasses/classevents.inc b/src/zr/playerclasses/classevents.inc index 43f60bf..99e7304 100644 --- a/src/zr/playerclasses/classevents.inc +++ b/src/zr/playerclasses/classevents.inc @@ -172,9 +172,9 @@ ClassOnClientInfected(client, bool:motherzombie = false) // Check if it's a mother zombie. if (motherzombie) { - // Set negative admin flag if client is admin, so it's removed in - // special class flags. - isadmin = ZRIsClientAdmin(client) ? -ZR_CLASS_FLAG_ADMIN_ONLY : 0; + // Set admin flag if client is admin, so it's removed in special class + // flags. + isadmin = ZRIsClientAdmin(client) ? ZR_CLASS_FLAG_ADMIN_ONLY : 0; // Get default mother zombie setting. GetConVarString(g_hCvarsList[CVAR_CLASSES_DEFAULT_M_ZOMB], motherzombiesetting, sizeof(motherzombiesetting)); @@ -186,7 +186,7 @@ ClassOnClientInfected(client, bool:motherzombie = false) else if (StrEqual(motherzombiesetting, "random", false)) { // Get random regular zombie class. Remove admin flag if admin. - motherindex = ClassGetRandomClass(ZR_CLASS_TEAM_ZOMBIES, _, _, ZR_CLASS_SPECIALFLAGS + isadmin); + motherindex = ClassGetRandomClass(ZR_CLASS_TEAM_ZOMBIES, _, _, ZR_CLASS_SPECIALFLAGS - isadmin); } else if (StrEqual(motherzombiesetting, "motherzombies", false)) { diff --git a/src/zr/playerclasses/filtertools.inc b/src/zr/playerclasses/filtertools.inc index cd57dcf..51a4d0c 100644 --- a/src/zr/playerclasses/filtertools.inc +++ b/src/zr/playerclasses/filtertools.inc @@ -909,7 +909,7 @@ stock ClassGetDefaultSpawnClass(teamid, cachetype = ZR_CLASS_CACHE_MODIFIED) // The class index is invalid or the team IDs didn't match. // Because it's user input, we'll fall back to the first class // in the specified team, and log a warning. - classindex = ClassGetFirstClass(teamid, _, _, cachetype); + classindex = ClassGetFirstClass(teamid, _, _, ZR_CLASS_SPECIALFLAGS, cachetype); LogEvent(false, LogType_Error, LOG_CORE_EVENTS, LogModule_Playerclasses, "Default Spawn Class", "Warning: Failed to set \"%s\" as default spawn class for team %d. The class doesn't exist or the team IDs doesn't match. Falling back to the first class in the team.", classname, teamid);