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

src/zombiereloaded.sp

@@ -23,12 +23,12 @@
 // External api (not done)
 //#include "zr/global"
 
-// Cvars (core)
-#include "zr/cvars"
-
 // Log (core)
 #include "zr/log"
 
+// Cvars (core)
+#include "zr/cvars"
+
 // Translations (core)
 #include "zr/translation"
 
@@ -44,6 +44,9 @@
 // Weapons (core)
 #include "zr/weapons/weapons"
 
+// Hitgroups (core)
+#include "zr/hitgroups"
+
 // Round End (core)
 #include "zr/roundend"
 
@@ -53,12 +56,12 @@
 // Damage (core)
 #include "zr/damage"
 
-// Hitgroups (core)
-#include "zr/hitgroups"
-
 // Account (module)
 #include "zr/account"
 
+// Visual Effects (module)
+#include "zr/visualeffects"
+
 // Sound Effects (module)
 #include "zr/soundeffects/soundeffects"
 
@@ -87,6 +90,8 @@
 #include "zr/sayhooks"
 #include "zr/zadmin"
 #include "zr/commands"
+
+// Event
 #include "zr/event"
 
 public Plugin:myinfo =
@@ -117,12 +122,13 @@ public OnPluginStart()
     
     // ======================================================================
     
+    // Log
+    LogInit();
+    
     // Cvars
     CvarsInit();
-    CvarsHook();
     
     // TODO: Be modulized/recoded.
-    HookEvents();
     HookChatCmds();
     CreateCommands();
     HookCommands();
@@ -135,6 +141,9 @@ public OnPluginStart()
     // Damage
     DamageInit();
     
+    // Event
+    EventInit();
+    
     // ======================================================================
     
     g_bMarket = LibraryExists("market");
@@ -172,10 +181,8 @@ public OnMapStart()
     LoadDownloadData();
     
     // Forward event to modules.
-    WeaponsLoad();
     RoundEndOnMapStart();
     InfectOnMapStart();
-    HitgroupsLoad();
     SEffectsOnMapStart();
     AntiStickOnMapStart();
     Anticamp_Startup();
@@ -207,9 +214,11 @@ public OnConfigsExecuted()
         }
     }
     
-    FindMapSky();
-    
     // Forward event to modules.
+    WeaponsLoad();
+    HitgroupsLoad();
+    InfectLoad();
+    VEffectsLoad();
     SEffectsLoad();
     ClassLoad();
 }