X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fvehicles%2Fall.qh;h=b58389d4abb7955feb7c3c80934583fadd4f6f1b;hb=a5357242d8541b890aa0f11e647669c7c3efb2df;hp=706585597ffa8060ef1ac318df5ed57ce125c047;hpb=debcc4abaf44b9663f32d7663b5c690e3b8bdcf9;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/common/vehicles/all.qh b/qcsrc/common/vehicles/all.qh
index 706585597..b58389d4a 100644
--- a/qcsrc/common/vehicles/all.qh
+++ b/qcsrc/common/vehicles/all.qh
@@ -3,13 +3,15 @@
 
 #include "vehicle.qh"
 
-REGISTRY(Vehicles, 24)
-REGISTER_REGISTRY(RegisterVehicles)
+REGISTRY(Vehicles, BITS(4))
+#define Vehicles_from(i) _Vehicles_from(i, VEH_Null)
+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 +21,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"
+#include "vehicle/_mod.inc"
 
 #endif