Fix FL_WEAPON flag overlapping FL_JUMPRELEASED. This unintentional change was introdu...

[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 d2d943c4e4d2afe88fa72e3d3108adbaf72694ed..2e4a2be5043b9a51d2eef18c92ae3eb090128454 100644 (file)
--- a/qcsrc/common/vehicles/all.qh
+++ b/qcsrc/common/vehicles/all.qh
@@ -1,19 +1,15 @@
-#ifndef VEHICLES_ALL_H
-#define VEHICLES_ALL_H
+#pragma once
 
 #include "vehicle.qh"
 
-REGISTRY(Vehicles, BITS(3))
-#define Vehicles_from(i) _Vehicles_from(i, VEH_Null)
-#define get_vehicleinfo(i) Vehicles_from(i)
-REGISTER_REGISTRY(RegisterVehicles)
+REGISTRY(Vehicles, BITS(4))
+REGISTER_REGISTRY(Vehicles)
 REGISTRY_CHECK(Vehicles)
 
 const int VEH_FIRST = 1;
-#define VEH_LAST (Vehicles_COUNT - 1)
+#define VEH_LAST (REGISTRY_COUNT(Vehicles) - 1)
 
-/** If you register a new vehicle, make sure to add it to all.inc */
-#define REGISTER_VEHICLE(id, inst) REGISTER(RegisterVehicles, VEH, Vehicles, id, vehicleid, inst)
+#define REGISTER_VEHICLE(id, inst) REGISTER(Vehicles, VEH, id, vehicleid, inst)
 
 #if defined(SVQC)
        #include "sv_vehicles.qh"
@@ -22,7 +18,6 @@ const int VEH_FIRST = 1;
 #endif
 
 REGISTER_VEHICLE(Null, NEW(Vehicle));
+REGISTRY_DEFINE_GET(Vehicles, VEH_Null)
 
-#include "all.inc"
-
-#endif
+#include "vehicle/_mod.qh"