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

2009-04-27 19:51:29 +02:00
parent 257659a683 abd38ee033
commit c9724a09c7
35 changed files with 1161 additions and 521 deletions
--- a/src/zr/playerclasses/playerclasses.inc
+++ b/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;
    }