Merge branch 'master' into Mario/vehicles

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

diff --git a/qcsrc/client/main.qc b/qcsrc/client/main.qc
index 13f9545faab60a7c944d4d45b192dc6e16ca8a46..cabb13e16a622ac5a08171ce86b439ef6398b5a3 100644 (file)
--- a/qcsrc/client/main.qc
+++ b/qcsrc/client/main.qc
@@ -9,9 +9,8 @@
 #include "wall.qh"
 #include "waypointsprites.qh"
 
-#include "vehicles/vehicles.qh"
-
-#include "../server/vehicles/bumblebee.qh"
+#include "../common/vehicles/vehicles.qh"
+#include "../common/vehicles/cl_vehicles.qh"
 
 #include "../common/net_notice.qh"
 
@@ -108,6 +107,7 @@ void CSQC_Init(void)
 
        // needs to be done so early because of the constants they create
        CALL_ACCUMULATED_FUNCTION(RegisterWeapons);
+       CALL_ACCUMULATED_FUNCTION(RegisterVehicles);
        CALL_ACCUMULATED_FUNCTION(RegisterMonsters);
        CALL_ACCUMULATED_FUNCTION(RegisterGametypes);
        CALL_ACCUMULATED_FUNCTION(RegisterNotifications);
@@ -126,7 +126,6 @@ void CSQC_Init(void)
        Hook_Precache();
        GibSplash_Precache();
        Casings_Precache();
-       Vehicles_Precache();
        turrets_precache();
        Tuba_Precache();
        CSQCPlayer_Precache();