Merge branch 'master' into TimePath/vehicles_cleanup

[xonotic/xonotic-data.pk3dir.git] / qcsrc / client / main.qc

diff --git a/qcsrc/client/main.qc b/qcsrc/client/main.qc
index a585a136e5b8d29ab8b9c9e77b9b126649dbedf2..ca3fb3093e85e9396b1c64ac76f57151adab67a3 100644 (file)
--- a/qcsrc/client/main.qc
+++ b/qcsrc/client/main.qc
@@ -23,11 +23,7 @@
 #include "wall.qh"
 #include "waypointsprites.qh"
 
 #include "wall.qh"
 #include "waypointsprites.qh"
 

-#include "mutators/events.qh"
-
-#include "../common/vehicles/unit/bumblebee.qh"
-#include "../common/vehicles/cl_vehicles.qh"
-#include "../common/vehicles/vehicles.qh"
+#include "../common/vehicles/all.qh"

 
 #include "mutators/events.qh"
 
 
 #include "mutators/events.qh"
 


@@ -153,7 +149,6 @@ void CSQC_Init(void)
        CALL_ACCUMULATED_FUNCTION(RegisterDeathtypes);
        CALL_ACCUMULATED_FUNCTION(RegisterHUD_Panels);
        CALL_ACCUMULATED_FUNCTION(RegisterEffects);
        CALL_ACCUMULATED_FUNCTION(RegisterDeathtypes);
        CALL_ACCUMULATED_FUNCTION(RegisterHUD_Panels);
        CALL_ACCUMULATED_FUNCTION(RegisterEffects);

-       CALL_ACCUMULATED_FUNCTION(RegisterVehicles);

 
        WaypointSprite_Load();
 
 
        WaypointSprite_Load();