Improve registry API by adding REGISTRY_MAX and REGISTRY_COUNT macros

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / turrets / all.qh

diff --git a/qcsrc/common/turrets/all.qh b/qcsrc/common/turrets/all.qh
index f87b1a274422cf71a4d4f0df3dcdac942a27d0fc..ee0e1918e4b9194c3d5f75b510d864095476b81e 100644 (file)
--- a/qcsrc/common/turrets/all.qh
+++ b/qcsrc/common/turrets/all.qh
@@ -16,7 +16,6 @@ REGISTRY_CHECK(Turrets)
        P(class, prefix, aim_maxpitch, float) \
        P(class, prefix, aim_maxrot, float) \
        P(class, prefix, aim_speed, float) \
-       P(class, prefix, ammo, float) \
        P(class, prefix, ammo_max, float) \
        P(class, prefix, ammo_recharge, float) \
        P(class, prefix, health, float) \
@@ -48,15 +47,17 @@ REGISTRY_CHECK(Turrets)
        /**/
 
 #define TR_CONFIG(class, turname, fld, T)     _TR_CONFIG(class, fld, T, turname)
-#define TR_CONFIG_BEGIN(class) METHOD(class, tr_config, void(class this)) {
-       #ifdef SVQC
+#ifdef SVQC
+       #define TR_CONFIG_BEGIN(class) METHOD(class, tr_config, void(class this)) {
                #define _TR_CONFIG(class, fld, T, turname) if (#turname == this.netname) TUR_CONFIG_WRITE_CVARS(turname, fld, T);
-       #else
+       #define TR_CONFIG_END() }
+#else
+       #define TR_CONFIG_BEGIN(class)
                #define _TR_CONFIG(class, fld, T, turname)
-       #endif
-#define TR_CONFIG_END() }
+       #define TR_CONFIG_END()
+#endif
 
-GENERIC_COMMAND(dumpturrets, "Dump all turrets into turrets_dump.txt")
+GENERIC_COMMAND(dumpturrets, "Dump all turrets into turrets_dump.txt", false)
 {
     switch(request)
     {
@@ -111,7 +112,7 @@ GENERIC_COMMAND(dumpturrets, "Dump all turrets into turrets_dump.txt")
 
 
 const int TUR_FIRST = 1;
-#define TUR_LAST (Turrets_COUNT - 1)
+#define TUR_LAST (REGISTRY_COUNT(Turrets) - 1)
 
 #define REGISTER_TURRET(id, inst) REGISTER(Turrets, TUR, id, m_id, inst)