Merge branch 'master' into 'master'

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

diff --git a/qcsrc/common/vehicles/all.qh b/qcsrc/common/vehicles/all.qh
index ccb3a05642830b27140c51bdbd46dbdd6efe5f5d..a18bfe13e14a5d0dc0432db9191967c5818ef6f2 100644 (file)
--- a/qcsrc/common/vehicles/all.qh
+++ b/qcsrc/common/vehicles/all.qh
@@ -58,11 +58,10 @@ const int VEH_FIRST = 1;
 /** If you register a new vehicle, make sure to add it to all.inc */
 #define REGISTER_VEHICLE(id, class) REGISTER(RegisterVehicles, VEH, vehicle_info, VEH_COUNT, id, vehicleid, NEW(class))
 #include "vehicle.qh"
-#define REGISTER_VEHICLE_SIMPLE(id, func, vehicleflags, min_s, max_s, modelname, headmodelname, hudmodelname, headtag, hudtag, viewtag, shortname, vname) \
+#define REGISTER_VEHICLE_SIMPLE(id, vehicleflags, min_s, max_s, modelname, headmodelname, hudmodelname, headtag, hudtag, viewtag, shortname, vname) \
     REGISTER_VEHICLE(id, Vehicle) {         \
        this.netname = shortname;           \
        this.vehicle_name = vname;          \
-       this.vehicle_func = func;           \
        this.mdl = modelname;               \
        this.spawnflags = vehicleflags;     \
        this.mins = min_s;                  \
@@ -77,7 +76,7 @@ const int VEH_FIRST = 1;
     REGISTER_INIT(VEH, id)
 REGISTER_REGISTRY(RegisterVehicles)
 
-REGISTER_VEHICLE(NULL, Vehicle);
+REGISTER_VEHICLE(Null, Vehicle);
 
 #include "all.inc"