Transifex autosync

[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 a44eb2209e673768ada5904ab7043e70df5e8273..2e4a2be5043b9a51d2eef18c92ae3eb090128454 100644 (file)
--- a/qcsrc/common/vehicles/all.qh
+++ b/qcsrc/common/vehicles/all.qh
@@ -1,15 +1,15 @@
-#ifndef VEHICLES_ALL_H
-#define VEHICLES_ALL_H
+#pragma once

 
 #include "vehicle.qh"
 
 
 #include "vehicle.qh"
 

-REGISTRY(Vehicles, BIT(3))
-REGISTER_REGISTRY(RegisterVehicles)
+REGISTRY(Vehicles, BITS(4))
+REGISTER_REGISTRY(Vehicles)
+REGISTRY_CHECK(Vehicles)
+

 const int VEH_FIRST = 1;
 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"
 
 #if defined(SVQC)
        #include "sv_vehicles.qh"


@@ -18,16 +18,6 @@ const int VEH_FIRST = 1;
 #endif
 
 REGISTER_VEHICLE(Null, NEW(Vehicle));
 #endif
 
 REGISTER_VEHICLE(Null, NEW(Vehicle));

+REGISTRY_DEFINE_GET(Vehicles, VEH_Null)

 
 

-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
+#include "vehicle/_mod.qh"