Merge branch 'master' into terencehill/bot_fixes

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / vehicles / vehicles.qc

diff --git a/qcsrc/common/vehicles/vehicles.qc b/qcsrc/common/vehicles/vehicles.qc
index 91540d315465f8f6684b93b0d2ec318a5a9df41c..e982c6f397817ec6e89762d73f770b21ae2284a1 100644 (file)
--- a/qcsrc/common/vehicles/vehicles.qc
+++ b/qcsrc/common/vehicles/vehicles.qc
@@ -1,4 +1,6 @@
-#include "all.qh"
+#include "unit/all.qh"
+
+#include "vehicles_include.qc"
 
 // VEHICLE PLUGIN SYSTEM
 entity vehicle_info[VEH_MAXCOUNT];
@@ -25,6 +27,8 @@ void vehicles_common_initialize()
        addstat(STAT_VEHICLESTAT_SHIELD,  AS_INT, vehicle_shield);
        addstat(STAT_VEHICLESTAT_ENERGY,  AS_INT, vehicle_energy);
 
+       addstat(STAT_VEHICLESTAT_W2MODE, AS_INT, vehicle_weapon2mode);
+
        addstat(STAT_VEHICLESTAT_AMMO1,   AS_INT, vehicle_ammo1);
        addstat(STAT_VEHICLESTAT_RELOAD1, AS_INT, vehicle_reload1);
 
@@ -55,7 +59,6 @@ void register_vehicle(float id, float(float) func, float vehicleflags, vector mi
        
        #ifndef MENUQC
        vehicles_common_initialize();
-       func(VR_PRECACHE);
        #endif
 }
 float v_null(float dummy) { return 0; }