Load vehicles in the menu with the registry system

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

diff --git a/qcsrc/common/vehicles/all.qc b/qcsrc/common/vehicles/all.qc
index 2c45308b4c9011f46aadc1981615b938322452dc..4923c1b0100db12c15ba38c9c5b14afd0d6f0fe3 100644 (file)
--- a/qcsrc/common/vehicles/all.qc
+++ b/qcsrc/common/vehicles/all.qc
@@ -14,7 +14,6 @@
 #undef IMPLEMENTATION
 
 // VEHICLE PLUGIN SYSTEM
-entity vehicle_info[VEH_MAXCOUNT];
 entity dummy_vehicle_info;
 
 void vehicles_common_initialize()
@@ -48,10 +47,9 @@ void vehicles_common_initialize()
 #endif // SVQC
 }
 
-void register_vehicle(float id, float(float) func, float vehicleflags, vector min_s, vector max_s, string modelname, string headmodelname, string hudmodelname, string headtag, string hudtag, string viewtag, string shortname, string vname)
+void register_vehicle(entity e, float id, float(float) func, float vehicleflags, vector min_s, vector max_s, string modelname, string headmodelname, string hudmodelname, string headtag, string hudtag, string viewtag, string shortname, string vname)
 {
-       entity e;
-       vehicle_info[id - 1] = e = spawn();
+       vehicle_info[id - 1] = e;
        e.classname = "vehicle_info";
        e.vehicleid = id;
        e.netname = shortname;
@@ -72,7 +70,6 @@ void register_vehicle(float id, float(float) func, float vehicleflags, vector mi
        vehicles_common_initialize();
        #endif
 }
-float v_null(float dummy) { return 0; }
 void register_vehicles_done()
 {
        dummy_vehicle_info = spawn();