Merged heads, with manual fixes to not revert newer changes.

src/zr/playerclasses/classevents.inc

@@ -22,7 +22,7 @@
  */
 ClassClientInit(client)
 {
-    if (ZRIsValidClient(client))
+    if (ZRIsClientValid(client))
     {
         // Set default class indexes on the player.
         ClassClientSetDefaultIndexes(client);

src/zr/playerclasses/clientoverlays.inc

@@ -20,7 +20,7 @@ new Handle:tOverlay[MAXPLAYERS + 1];
 new bool:bClientHasOverlay[MAXPLAYERS + 1];
 
 /**
- * Tells wether the overlay is on or not.
+ * Tells whether the overlay is on or not.
  */
 new bool:bClientOverlayOn[MAXPLAYERS + 1];
 
@@ -104,7 +104,7 @@ ClassOverlayStop(client)
 
 public Action:ClassOverlayTimer(Handle:timer, any:client)
 {
-    if (!IsClientInGame(client) || !IsPlayerZombie(client))
+    if (!IsClientInGame(client) || !InfectIsClientInfected(client))
     {
         tOverlay[client] = INVALID_HANDLE;
         return Plugin_Stop;

src/zr/playerclasses/filtertools.inc

@@ -359,7 +359,7 @@ ClassGetActiveIndex(client)
     else
     {
         // Not in admin mode, check if player is human or zombie.
-        if (IsPlayerHuman(client))
+        if (InfectIsClientHuman(client))
         {
             teamid = ZR_CLASS_TEAM_HUMANS;
         }

src/zr/playerclasses/playerclasses.inc

@@ -495,7 +495,7 @@ bool:ClassReloadDataCache()
 bool:ClassReloadPlayerCache(client, classindex, cachetype = ZR_CLASS_CACHE_MODIFIED)
 {
     // Validate indexes.
-    if (!ClassValidateIndex(classindex) || !ZRIsValidClient(client))
+    if (!ClassValidateIndex(classindex) || !ZRIsClientValid(client))
     {
         return false;
     }