Merged heads and fixed conflicts.

src/zr/playerclasses/classevents.inc

@@ -17,6 +17,24 @@
  * ------------------------------------
  */
 
+/**
+ * Create class-related cookies here.
+ */
+ClassOnCookiesCreate()
+{
+    // Forward event to sub-modules.
+    ClassOverlayOnCookiesCreate();
+}
+
+/**
+ * Called when all modules are done loading.
+ */
+ClassOnModulesLoaded()
+{
+    // Set default classes on all player slots.
+    ClassClientSetDefaultIndexes();
+}
+
 /**
  * Called when a client connects to the server (OnClientPutInServer).
  */
@@ -35,15 +53,6 @@ ClassClientInit(client)
     ClassOverlayClientInit(client);
 }
 
-/**
- * Called when all modules are done loading.
- */
-ClassOnModulesLoaded()
-{
-    // Set default classes on all player slots.
-    ClassClientSetDefaultIndexes();
-}
-
 /**
  * Called a client disconnects.
  */
@@ -124,9 +133,6 @@ ClassOnClientSpawn(client)
         ClassReloadPlayerCache(client, ClassGetActiveIndex(client));
         ClassApplyAttributes(client);
     }
-    
-    // Forward event to sub-modules.
-    ClassOverlayOnClientSpawn(client);
 }
 
 /**
@@ -206,7 +212,4 @@ ClassOnClientInfected(client, bool:motherzombie = false)
     
     // Apply the new attributes.
     ClassApplyAttributes(client, motherzombie);
-    
-    // Forward event to sub-modules.
-    ClassOverlayOnClientInfected(client);
 }