Merge branch 'master' into terencehill/slider_anim_improvements

[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 08a3020c753a2b6f3c5e33475f437c4e52e381e6..fa9e83f48531fa66231691391eade3a57781808f 100644 (file)
--- a/qcsrc/common/vehicles/all.qh
+++ b/qcsrc/common/vehicles/all.qh
@@ -41,22 +41,6 @@ entity get_vehicleinfo(float id);
 .entity tur_head;
 
 
-// entity properties of vehicleinfo:
-.int vehicleid; // VEH_...
-.string netname; // short name
-.string vehicle_name; // human readable name
-.int(int) vehicle_func; // v_...
-.string mdl; // currently a copy of the model
-.string model; // full name of model
-.string head_model; // full name of tur_head model
-.string hud_model; // cockpit model
-.string tag_head; // tur_head model tag
-.string tag_hud; // hud model tag
-.string tag_view; // cockpit model tag
-.int() PlayerPhysplug; // player physics mod
-.int spawnflags;
-.vector mins, maxs; // vehicle hitbox size
-
 // other useful macros
 #define VEH_ACTION(vehicletype,mrequest) (get_vehicleinfo(vehicletype)).vehicle_func(mrequest)
 #define VEH_NAME(vehicletype) (get_vehicleinfo(vehicletype)).vehicle_name
@@ -74,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;                  \
@@ -93,19 +76,7 @@ const int VEH_FIRST = 1;
     REGISTER_INIT(VEH, id)
 REGISTER_REGISTRY(RegisterVehicles)
 
-
-REGISTER_VEHICLE(NULL, Vehicle) {
-    this.vehicleid = 0; // you can recognize dummies by this
-    this.netname = "";
-    this.vehicle_name = "Vehicle";
-    this.vehicle_func = v_null;
-    this.mdl = "";
-    this.mins = '-0 -0 -0';
-    this.maxs = '0 0 0';
-    this.model = "";
-    this.head_model = "";
-    this.hud_model = "";
-}
+REGISTER_VEHICLE(NULL, Vehicle);
 
 #include "all.inc"