X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fvehicles%2Fall.qh;h=ed44be777bf369acd3cc2ad697b89cb03b5bfd11;hb=0f1ffe9c0565f1f1a0d6f58240760f227aa3ee99;hp=d2d943c4e4d2afe88fa72e3d3108adbaf72694ed;hpb=e9f30b97435c6afe3d6911f21e1f4fd1b97e93da;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/common/vehicles/all.qh b/qcsrc/common/vehicles/all.qh index d2d943c4e..ed44be777 100644 --- a/qcsrc/common/vehicles/all.qh +++ b/qcsrc/common/vehicles/all.qh @@ -1,19 +1,16 @@ -#ifndef VEHICLES_ALL_H -#define VEHICLES_ALL_H +#pragma once #include "vehicle.qh" -REGISTRY(Vehicles, BITS(3)) +REGISTRY(Vehicles, BITS(4)) #define Vehicles_from(i) _Vehicles_from(i, VEH_Null) -#define get_vehicleinfo(i) Vehicles_from(i) -REGISTER_REGISTRY(RegisterVehicles) +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, id, vehicleid, inst) +#define REGISTER_VEHICLE(id, inst) REGISTER(Vehicles, VEH, id, vehicleid, inst) #if defined(SVQC) #include "sv_vehicles.qh" @@ -23,6 +20,4 @@ const int VEH_FIRST = 1; REGISTER_VEHICLE(Null, NEW(Vehicle)); -#include "all.inc" - -#endif +#include "vehicle/_mod.qh"