Use an org local instead of multi-line setorigin

[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 706585597ffa8060ef1ac318df5ed57ce125c047..3867cf1edd5490b7403750de6f38a5c12c436606 100644 (file)
--- a/qcsrc/common/vehicles/all.qh
+++ b/qcsrc/common/vehicles/all.qh
@@ -3,13 +3,17 @@
 
 #include "vehicle.qh"
 
-REGISTRY(Vehicles, 24)
-REGISTER_REGISTRY(RegisterVehicles)
+REGISTRY(Vehicles, BITS(3))
+#define Vehicles_from(i) _Vehicles_from(i, VEH_Null)
+#define get_vehicleinfo(i) Vehicles_from(i)
+REGISTER_REGISTRY(Vehicles)
+REGISTRY_CHECK(Vehicles)
+
 const int VEH_FIRST = 1;
 #define VEH_LAST (Vehicles_COUNT - 1)
 
 /** If you register a new vehicle, make sure to add it to all.inc */
-#define REGISTER_VEHICLE(id, inst) REGISTER(RegisterVehicles, VEH, Vehicles, Vehicles_COUNT, id, vehicleid, inst)
+#define REGISTER_VEHICLE(id, inst) REGISTER(Vehicles, VEH, id, vehicleid, inst)
 
 #if defined(SVQC)
        #include "sv_vehicles.qh"
@@ -19,15 +23,6 @@ const int VEH_FIRST = 1;
 
 REGISTER_VEHICLE(Null, NEW(Vehicle));
 
-Vehicle get_vehicleinfo(int id)
-{
-       if (id >= VEH_FIRST && id <= VEH_LAST) {
-               Vehicle v = Vehicles[id];
-               if (v) return v;
-       }
-       return VEH_Null;
-}
-
 #include "all.inc"
 
 #endif