Improve registry API by adding REGISTRY_MAX and REGISTRY_COUNT macros

diff --git a/qcsrc/client/hud/hud.qc b/qcsrc/client/hud/hud.qc
index 3a13048d823b6398cdde1c7b9c52ced193a33449..dd91dbd687894840efea279dd9c87899ef037334 100644 (file)
--- a/qcsrc/client/hud/hud.qc
+++ b/qcsrc/client/hud/hud.qc
@@ -667,18 +667,18 @@ void HUD_Main()
 
        // cache the panel order into the panel_order array
        if(autocvar__hud_panelorder != hud_panelorder_prev) {
 
        // cache the panel order into the panel_order array
        if(autocvar__hud_panelorder != hud_panelorder_prev) {

-               for(i = 0; i < hud_panels_COUNT; ++i)
+               for(i = 0; i < REGISTRY_COUNT(hud_panels); ++i)

                        panel_order[i] = -1;
                string s = "";
                int p_num;
                bool warning = false;
                int argc = tokenize_console(autocvar__hud_panelorder);
                        panel_order[i] = -1;
                string s = "";
                int p_num;
                bool warning = false;
                int argc = tokenize_console(autocvar__hud_panelorder);

-               if (argc > hud_panels_COUNT)
+               if (argc > REGISTRY_COUNT(hud_panels))

                        warning = true;
                //first detect wrong/missing panel numbers
                        warning = true;
                //first detect wrong/missing panel numbers

-               for(i = 0; i < hud_panels_COUNT; ++i) {
+               for(i = 0; i < REGISTRY_COUNT(hud_panels); ++i) {

                        p_num = stoi(argv(i));
                        p_num = stoi(argv(i));

-                       if (p_num >= 0 && p_num < hud_panels_COUNT) { //correct panel number?
+                       if (p_num >= 0 && p_num < REGISTRY_COUNT(hud_panels)) { //correct panel number?

                                if (panel_order[p_num] == -1) //found for the first time?
                                        s = strcat(s, ftos(p_num), " ");
                                panel_order[p_num] = 1; //mark as found
                                if (panel_order[p_num] == -1) //found for the first time?
                                        s = strcat(s, ftos(p_num), " ");
                                panel_order[p_num] = 1; //mark as found


@@ -686,7 +686,7 @@ void HUD_Main()
                        else
                                warning = true;
                }
                        else
                                warning = true;
                }

-               for(i = 0; i < hud_panels_COUNT; ++i) {
+               for(i = 0; i < REGISTRY_COUNT(hud_panels); ++i) {

                        if (panel_order[i] == -1) {
                                warning = true;
                                s = strcat(s, ftos(i), " "); //add missing panel number
                        if (panel_order[i] == -1) {
                                warning = true;
                                s = strcat(s, ftos(i), " "); //add missing panel number


@@ -700,14 +700,14 @@ void HUD_Main()
 
                //now properly set panel_order
                tokenize_console(s);
 
                //now properly set panel_order
                tokenize_console(s);

-               for(i = 0; i < hud_panels_COUNT; ++i) {
+               for(i = 0; i < REGISTRY_COUNT(hud_panels); ++i) {

                        panel_order[i] = stof(argv(i));
                }
        }
 
        hud_draw_maximized = 0;
        // draw panels in the order specified by panel_order array
                        panel_order[i] = stof(argv(i));
                }
        }
 
        hud_draw_maximized = 0;
        // draw panels in the order specified by panel_order array

-       for(i = hud_panels_COUNT - 1; i >= 0; --i)
+       for(i = REGISTRY_COUNT(hud_panels) - 1; i >= 0; --i)

                HUD_Panel_Draw(hud_panels_from(panel_order[i]));
 
        HUD_Vehicle();
                HUD_Panel_Draw(hud_panels_from(panel_order[i]));
 
        HUD_Vehicle();

diff --git a/qcsrc/client/hud/hud.qh b/qcsrc/client/hud/hud.qh
index 2c12a6150ee560b528fdabb787029b209c80091f..c0a322244d3431946ba3db32e9007d3c69075c75 100644 (file)
--- a/qcsrc/client/hud/hud.qh
+++ b/qcsrc/client/hud/hud.qh
@@ -43,7 +43,7 @@ REGISTER_REGISTRY(hud_panels)
                ); \
 MACRO_END
 
                ); \
 MACRO_END
 

-int panel_order[hud_panels_MAX];
+int panel_order[REGISTRY_MAX(hud_panels)];

 string hud_panelorder_prev;
 
 bool hud_draw_maximized;
 string hud_panelorder_prev;
 
 bool hud_draw_maximized;


@@ -89,7 +89,7 @@ float highlightedAction; // 0 = nothing, 1 = move, 2 = resize
 
 const float BORDER_MULTIPLIER = 4;
 float scoreboard_bottom;
 
 const float BORDER_MULTIPLIER = 4;
 float scoreboard_bottom;

-int weapon_accuracy[Weapons_MAX];
+int weapon_accuracy[REGISTRY_MAX(Weapons)];

 
 entity complain_weapon;
 int complain_weapon_type;
 
 entity complain_weapon;
 int complain_weapon_type;

diff --git a/qcsrc/client/hud/hud_config.qc b/qcsrc/client/hud/hud_config.qc
index c4ae095ac3c559c7c3fd67a06084f990f0246e0a..61f0d4dcb59f94bf49ce37f3c63c0debd372a7e5 100644 (file)
--- a/qcsrc/client/hud/hud_config.qc
+++ b/qcsrc/client/hud/hud_config.qc
@@ -60,7 +60,7 @@ void HUD_Panel_ExportCfg(string cfgname)
                HUD_Write("\n");
 
                // common cvars for all panels
                HUD_Write("\n");
 
                // common cvars for all panels

-               for (int i = 0; i < hud_panels_COUNT; ++i)
+               for (int i = 0; i < REGISTRY_COUNT(hud_panels); ++i)

                {
                        panel = hud_panels_from(i);
 
                {
                        panel = hud_panels_from(i);
 


@@ -102,7 +102,7 @@ vector HUD_Panel_CheckMove(vector myPos, vector mySize)
        vector myCenter, targCenter;
        vector myTarget = myPos;
        int i;
        vector myCenter, targCenter;
        vector myTarget = myPos;
        int i;

-       for (i = 0; i < hud_panels_COUNT; ++i) {
+       for (i = 0; i < REGISTRY_COUNT(hud_panels); ++i) {

                panel = hud_panels_from(i);
                if(!(panel.panel_configflags & PANEL_CONFIG_MAIN)) continue;
                if(panel == highlightedPanel) continue;
                panel = hud_panels_from(i);
                if(!(panel.panel_configflags & PANEL_CONFIG_MAIN)) continue;
                if(panel == highlightedPanel) continue;


@@ -199,7 +199,7 @@ vector HUD_Panel_CheckResize(vector mySize, vector resizeorigin) {
        vector dist;
        float ratio = mySize.x/mySize.y;
        int i;
        vector dist;
        float ratio = mySize.x/mySize.y;
        int i;

-       for (i = 0; i < hud_panels_COUNT; ++i) {
+       for (i = 0; i < REGISTRY_COUNT(hud_panels); ++i) {

                panel = hud_panels_from(i);
                if(!(panel.panel_configflags & PANEL_CONFIG_MAIN)) continue;
                if(panel == highlightedPanel) continue;
                panel = hud_panels_from(i);
                if(!(panel.panel_configflags & PANEL_CONFIG_MAIN)) continue;
                if(panel == highlightedPanel) continue;


@@ -500,13 +500,13 @@ void HUD_Panel_Arrow_Action(float nPrimary)
        }
 }
 
        }
 }
 

-entity tab_panels[hud_panels_MAX];
+entity tab_panels[REGISTRY_MAX(hud_panels)];

 entity tab_panel;
 vector tab_panel_pos;
 float tab_backward;
 void reset_tab_panels()
 {
 entity tab_panel;
 vector tab_panel_pos;
 float tab_backward;
 void reset_tab_panels()
 {

-       for (int i = 0; i < hud_panels_COUNT; ++i)
+       for (int i = 0; i < REGISTRY_COUNT(hud_panels); ++i)

                tab_panels[i] = NULL;
 }
 float HUD_Panel_InputEvent(float bInputType, float nPrimary, float nSecondary)
                tab_panels[i] = NULL;
 }
 float HUD_Panel_InputEvent(float bInputType, float nPrimary, float nSecondary)


@@ -645,7 +645,7 @@ LABEL(find_tab_panel)
                k=0;
                while(++k)
                {
                k=0;
                while(++k)
                {

-                       for(i = 0; i < hud_panels_COUNT; ++i)
+                       for(i = 0; i < REGISTRY_COUNT(hud_panels); ++i)

                        {
                                panel = hud_panels_from(i);
                                if(!(panel.panel_configflags & PANEL_CONFIG_MAIN))
                        {
                                panel = hud_panels_from(i);
                                if(!(panel.panel_configflags & PANEL_CONFIG_MAIN))


@@ -794,7 +794,7 @@ LABEL(find_tab_panel)
 int HUD_Panel_Check_Mouse_Pos(bool allow_move)
 {
        int i, j = 0;
 int HUD_Panel_Check_Mouse_Pos(bool allow_move)
 {
        int i, j = 0;

-       while(j < hud_panels_COUNT)
+       while(j < REGISTRY_COUNT(hud_panels))

        {
                i = panel_order[j];
                j += 1;
        {
                i = panel_order[j];
                j += 1;


@@ -840,7 +840,7 @@ void HUD_Panel_FirstInDrawQ(float id)
        int i;
        int place = -1;
        // find out where in the array our current id is, save into place
        int i;
        int place = -1;
        // find out where in the array our current id is, save into place

-       for(i = 0; i < hud_panels_COUNT; ++i)
+       for(i = 0; i < REGISTRY_COUNT(hud_panels); ++i)

        {
                if(panel_order[i] == id)
                {
        {
                if(panel_order[i] == id)
                {


@@ -850,7 +850,7 @@ void HUD_Panel_FirstInDrawQ(float id)
        }
        // place last if we didn't find a place for it yet (probably new panel, or screwed up cvar)
        if(place == -1)
        }
        // place last if we didn't find a place for it yet (probably new panel, or screwed up cvar)
        if(place == -1)

-               place = hud_panels_COUNT - 1;
+               place = REGISTRY_COUNT(hud_panels) - 1;

 
        // move all ids up by one step in the array until "place"
        for(i = place; i > 0; --i)
 
        // move all ids up by one step in the array until "place"
        for(i = place; i > 0; --i)


@@ -862,7 +862,7 @@ void HUD_Panel_FirstInDrawQ(float id)
 
        // let's save them into the cvar by some strcat trickery
        string s = "";
 
        // let's save them into the cvar by some strcat trickery
        string s = "";

-       for(i = 0; i < hud_panels_COUNT; ++i)
+       for(i = 0; i < REGISTRY_COUNT(hud_panels); ++i)

        {
                s = strcat(s, ftos(panel_order[i]), " ");
        }
        {
                s = strcat(s, ftos(panel_order[i]), " ");
        }


@@ -874,7 +874,7 @@ void HUD_Panel_Highlight(float allow_move)
 {
        int i, j = 0;
 
 {
        int i, j = 0;
 

-       while(j < hud_panels_COUNT)
+       while(j < REGISTRY_COUNT(hud_panels))

        {
                i = panel_order[j];
                j += 1;
        {
                i = panel_order[j];
                j += 1;


@@ -1082,7 +1082,7 @@ void HUD_Configure_Frame()
                if(!hud_configure_prev)
                {
                        hudShiftState = 0;
                if(!hud_configure_prev)
                {
                        hudShiftState = 0;

-                       for(i = hud_panels_COUNT - 1; i >= 0; --i)
+                       for(i = REGISTRY_COUNT(hud_panels) - 1; i >= 0; --i)

                                hud_panels_from(panel_order[i]).update_time = time;
                }
 
                                hud_panels_from(panel_order[i]).update_time = time;
                }
 

diff --git a/qcsrc/client/hud/panel/scoreboard.qc b/qcsrc/client/hud/panel/scoreboard.qc
index 962759011a9e3d2b13e9f5e69d228f1e0cb75a6d..a7efc181a0b1680a94ccdb01d9ea18afda3f549c 100644 (file)
--- a/qcsrc/client/hud/panel/scoreboard.qc
+++ b/qcsrc/client/hud/panel/scoreboard.qc
@@ -1192,11 +1192,11 @@ vector Scoreboard_AccuracyStats_Draw(vector pos, vector rgb, vector bg_size)
                }
        });
 
                }
        });
 

-       int weapon_cnt = (Weapons_COUNT - 1) - disownedcnt - nHidden;
+       int weapon_cnt = (REGISTRY_COUNT(Weapons) - 1) - disownedcnt - nHidden;

        if (weapon_cnt <= 0) return pos;
 
        int rows = 1;
        if (weapon_cnt <= 0) return pos;
 
        int rows = 1;

-       if (autocvar_hud_panel_scoreboard_accuracy_doublerows && weapon_cnt >= floor((Weapons_COUNT - nHidden - 1) * 0.5))
+       if (autocvar_hud_panel_scoreboard_accuracy_doublerows && weapon_cnt >= floor((REGISTRY_COUNT(Weapons) - nHidden - 1) * 0.5))

                rows = 2;
        int columnns = ceil(weapon_cnt / rows);
 
                rows = 2;
        int columnns = ceil(weapon_cnt / rows);
 

diff --git a/qcsrc/client/hud/panel/weapons.qc b/qcsrc/client/hud/panel/weapons.qc
index f7444daaa3572cd063eaa62f454430f8ef353db0..633e37b55d6181daf041a37c1cea40a38ea3308f 100644 (file)
--- a/qcsrc/client/hud/panel/weapons.qc
+++ b/qcsrc/client/hud/panel/weapons.qc
@@ -37,7 +37,7 @@ void HUD_Weapons_Export(int fh)
        HUD_Write_Cvar("hud_panel_weapons_selection_speed");
 }
 
        HUD_Write_Cvar("hud_panel_weapons_selection_speed");
 }
 

-entity weaponorder[Weapons_MAX];
+entity weaponorder[REGISTRY_MAX(Weapons)];

 void weaponorder_swap(int i, int j, entity pass)
 {
        TC(int, i); TC(int, j);
 void weaponorder_swap(int i, int j, entity pass)
 {
        TC(int, i); TC(int, j);


@@ -61,7 +61,7 @@ int weaponorder_cmp(int i, int j, entity pass)
                if (weapons_stat & WepSet_FromWeapon(it)) continue; \
                if (it.spawnflags & (WEP_FLAG_HIDDEN | WEP_FLAG_MUTATORBLOCKED | WEP_FLAG_SPECIALATTACK)) nHidden += 1; \
        }); \
                if (weapons_stat & WepSet_FromWeapon(it)) continue; \
                if (it.spawnflags & (WEP_FLAG_HIDDEN | WEP_FLAG_MUTATORBLOCKED | WEP_FLAG_SPECIALATTACK)) nHidden += 1; \
        }); \

-       vector table_size = HUD_GetTableSize_BestItemAR((Weapons_COUNT - 1) - nHidden, panel_size, aspect); \
+       vector table_size = HUD_GetTableSize_BestItemAR((REGISTRY_COUNT(Weapons) - 1) - nHidden, panel_size, aspect); \

        columns = table_size.x; \
        rows = table_size.y; \
        weapon_size.x = panel_size.x / columns; \
        columns = table_size.x; \
        rows = table_size.y; \
        weapon_size.x = panel_size.x / columns; \


@@ -135,7 +135,7 @@ void HUD_Weapons()
 
                int weapon_cnt = 0;
                FOREACH(Weapons, it != WEP_Null && it.impulse >= 0, weaponorder[weapon_cnt++] = it);
 
                int weapon_cnt = 0;
                FOREACH(Weapons, it != WEP_Null && it.impulse >= 0, weaponorder[weapon_cnt++] = it);

-               for(i = weapon_cnt; i < Weapons_MAX; ++i)
+               for(i = weapon_cnt; i < REGISTRY_MAX(Weapons); ++i)

                        weaponorder[i] = NULL;
                heapsort(weapon_cnt, weaponorder_swap, weaponorder_cmp, NULL);
 
                        weaponorder[i] = NULL;
                heapsort(weapon_cnt, weaponorder_swap, weaponorder_cmp, NULL);
 


@@ -178,8 +178,8 @@ void HUD_Weapons()
                                if (it.spawnflags & WEP_FLAG_MUTATORBLOCKED) nHidden += 1;
                        });
                        weapons_stat = '0 0 0';
                                if (it.spawnflags & WEP_FLAG_MUTATORBLOCKED) nHidden += 1;
                        });
                        weapons_stat = '0 0 0';

-                       float countw = 1 + floor((floor(time * cvar("wep_add"))) % ((Weapons_COUNT - 1) - nHidden));
-                       for(i = 0, j = 0; i <= (Weapons_COUNT - 1) && j < countw; ++i)
+                       float countw = 1 + floor((floor(time * cvar("wep_add"))) % ((REGISTRY_COUNT(Weapons) - 1) - nHidden));
+                       for(i = 0, j = 0; i <= (REGISTRY_COUNT(Weapons) - 1) && j < countw; ++i)

                        {
                                if(weaponorder[i].spawnflags & WEP_FLAG_MUTATORBLOCKED)
                                        continue;
                        {
                                if(weaponorder[i].spawnflags & WEP_FLAG_MUTATORBLOCKED)
                                        continue;


@@ -272,7 +272,7 @@ void HUD_Weapons()
                        panel_pos.y += (old_panel_size.y - panel_size.y) / 2;
        }
        else
                        panel_pos.y += (old_panel_size.y - panel_size.y) / 2;
        }
        else

-               weapon_count = (Weapons_COUNT - 1);
+               weapon_count = (REGISTRY_COUNT(Weapons) - 1);

 
        // animation for fading in/out the panel respectively when not in use
        if(!autocvar__hud_configure)
 
        // animation for fading in/out the panel respectively when not in use
        if(!autocvar__hud_configure)

diff --git a/qcsrc/client/view.qc b/qcsrc/client/view.qc
index 57cd15a78bd7fd68cac6454b13232d56a4b1d1c4..c5de3aeeacf7d0a41dc5257de08dd790cfe48d87 100644 (file)
--- a/qcsrc/client/view.qc
+++ b/qcsrc/client/view.qc
@@ -1538,7 +1538,7 @@ void SpecialCommand()
                        {
                                slot.x = bound(0, (random() * vid_conwidth + 1), vid_conwidth);
                                slot.y = 1; // start it off 0 so we can use it
                        {
                                slot.x = bound(0, (random() * vid_conwidth + 1), vid_conwidth);
                                slot.y = 1; // start it off 0 so we can use it

-                               slot.z = floor(random() * Weapons_MAX);
+                               slot.z = floor(random() * REGISTRY_MAX(Weapons));

                                sc_spawntime = time + bound(0.4, random(), 0.75); // prevent spawning another one for this amount of time!
                                vector newcolor = randomvec() * 2;
                                newcolor.x = bound(0.4, newcolor.x, 1);
                                sc_spawntime = time + bound(0.4, random(), 0.75); // prevent spawning another one for this amount of time!
                                vector newcolor = randomvec() * 2;
                                newcolor.x = bound(0.4, newcolor.x, 1);

diff --git a/qcsrc/common/effects/all.qc b/qcsrc/common/effects/all.qc
index 9732be2e3bf65e82f125b176f8ed2f709d2879d6..99849deb99d4787b673e2941476dc0facc0ea77a 100644 (file)
--- a/qcsrc/common/effects/all.qc
+++ b/qcsrc/common/effects/all.qc
@@ -4,7 +4,7 @@ REGISTER_NET_TEMP(net_effect)
 #ifdef CSQC
 NET_HANDLE(net_effect, bool isNew)
 {
 #ifdef CSQC
 NET_HANDLE(net_effect, bool isNew)
 {

-       int net_name = (Effects_COUNT >= 255) ? ReadShort() : ReadByte();
+       int net_name = (REGISTRY_COUNT(Effects) >= 255) ? ReadShort() : ReadByte();

 
        entity eff = Effects_from(net_name);
 
 
        entity eff = Effects_from(net_name);
 


@@ -34,7 +34,7 @@ bool Net_Write_Effect(entity this, entity client, int sf)
        int channel = MSG_ONE;
        msg_entity = client;
        WriteHeader(channel, net_effect);
        int channel = MSG_ONE;
        msg_entity = client;
        WriteHeader(channel, net_effect);

-       (Effects_COUNT >= 255)
+       (REGISTRY_COUNT(Effects) >= 255)

        ? WriteShort(channel, this.m_id)
        : WriteByte(channel, this.m_id);
        WriteVector(channel, this.eent_net_location);
        ? WriteShort(channel, this.m_id)
        : WriteByte(channel, this.m_id);
        WriteVector(channel, this.eent_net_location);

diff --git a/qcsrc/common/items/inventory.qh b/qcsrc/common/items/inventory.qh
index 9f0a43a0750959f08d1847886e09e88ea017673d..29a02047f22938a2345b59998f24d626875a8d09 100644 (file)
--- a/qcsrc/common/items/inventory.qh
+++ b/qcsrc/common/items/inventory.qh
@@ -5,7 +5,7 @@
 #ifdef GAMEQC
 CLASS(Inventory, Object)
     /** Stores counts of items, the id being the index */
 #ifdef GAMEQC
 CLASS(Inventory, Object)
     /** Stores counts of items, the id being the index */

-    ATTRIBARRAY(Inventory, inv_items, int, Items_MAX);
+    ATTRIBARRAY(Inventory, inv_items, int, REGISTRY_MAX(Items));

     /** Previous state */
     ATTRIB(Inventory, inventory, Inventory);
 ENDCLASS(Inventory)
     /** Previous state */
     ATTRIB(Inventory, inventory, Inventory);
 ENDCLASS(Inventory)


@@ -16,7 +16,7 @@ ENDCLASS(Inventory)
 REGISTER_NET_LINKED(ENT_CLIENT_INVENTORY)
 
 const int Inventory_groups_minor = 8; // exactly 1 byte
 REGISTER_NET_LINKED(ENT_CLIENT_INVENTORY)
 
 const int Inventory_groups_minor = 8; // exactly 1 byte

-const int Inventory_groups_major = 3; // ceil(Items_MAX / Inventory_groups_minor)
+const int Inventory_groups_major = 3; // ceil(REGISTRY_MAX(Items) / Inventory_groups_minor)

 
 #define G_MAJOR(id) (floor((id) / Inventory_groups_minor))
 #define G_MINOR(id) ((id) % Inventory_groups_minor)
 
 #define G_MAJOR(id) (floor((id) / Inventory_groups_minor))
 #define G_MINOR(id) ((id) % Inventory_groups_minor)

diff --git a/qcsrc/common/monsters/all.qh b/qcsrc/common/monsters/all.qh
index c9e5ad37ba6448ed85374378affde2e871a6197c..e31fd0bad47aed4fb8725d63c5d316324f2f63be 100644 (file)
--- a/qcsrc/common/monsters/all.qh
+++ b/qcsrc/common/monsters/all.qh
@@ -8,7 +8,7 @@ REGISTRY(Monsters, BITS(5))
 REGISTER_REGISTRY(Monsters)
 REGISTRY_CHECK(Monsters)
 const int MON_FIRST = 1;
 REGISTER_REGISTRY(Monsters)
 REGISTRY_CHECK(Monsters)
 const int MON_FIRST = 1;

-#define MON_LAST (Monsters_COUNT - 1)
+#define MON_LAST (REGISTRY_COUNT(Monsters) - 1)

 #define REGISTER_MONSTER(id, inst) REGISTER(Monsters, MON, id, monsterid, inst)
 
 #include "monster.qh"
 #define REGISTER_MONSTER(id, inst) REGISTER(Monsters, MON, id, monsterid, inst)
 
 #include "monster.qh"

diff --git a/qcsrc/common/mutators/mutator/itemstime/itemstime.qc b/qcsrc/common/mutators/mutator/itemstime/itemstime.qc
index 78a5624c31b98bf74829377557fa7af956927944..e99a6af5dc0dea52328e637e97bd27dcc601f9c2 100644 (file)
--- a/qcsrc/common/mutators/mutator/itemstime/itemstime.qc
+++ b/qcsrc/common/mutators/mutator/itemstime/itemstime.qc
@@ -16,8 +16,8 @@ void IT_Write(entity e, int i, float f) {
 
 #ifdef CSQC
 // reserve one more spot for superweapons time
 
 #ifdef CSQC
 // reserve one more spot for superweapons time

-float ItemsTime_time[Items_MAX + 1];
-float ItemsTime_availableTime[Items_MAX + 1];
+float ItemsTime_time[REGISTRY_MAX(Items) + 1];
+float ItemsTime_availableTime[REGISTRY_MAX(Items) + 1];

 NET_HANDLE(itemstime, bool isNew)
 {
     int i = ReadByte();
 NET_HANDLE(itemstime, bool isNew)
 {
     int i = ReadByte();


@@ -33,7 +33,7 @@ STATIC_INIT(ItemsTime_Init) {
        FOREACH(Items, true, {
                ItemsTime_time[it.m_id] = -1;
        });
        FOREACH(Items, true, {
                ItemsTime_time[it.m_id] = -1;
        });

-       ItemsTime_time[Items_MAX] = -1;
+       ItemsTime_time[REGISTRY_MAX(Items)] = -1;

 }
 
 int autocvar_hud_panel_itemstime = 2;
 }
 
 int autocvar_hud_panel_itemstime = 2;


@@ -71,13 +71,13 @@ bool Item_ItemsTime_Allow(GameItem it)
 #ifdef SVQC
 
 // reserve one more spot for superweapons time
 #ifdef SVQC
 
 // reserve one more spot for superweapons time

-float it_times[Items_MAX + 1];
+float it_times[REGISTRY_MAX(Items) + 1];

 
 STATIC_INIT(ItemsTime_Init) {
        FOREACH(Items, Item_ItemsTime_Allow(it), {
                it_times[it.m_id] = -1;
        });
 
 STATIC_INIT(ItemsTime_Init) {
        FOREACH(Items, Item_ItemsTime_Allow(it), {
                it_times[it.m_id] = -1;
        });

-       it_times[Items_MAX] = -1;
+       it_times[REGISTRY_MAX(Items)] = -1;

 }
 
 void Item_ItemsTime_ResetTimes()
 }
 
 void Item_ItemsTime_ResetTimes()


@@ -85,7 +85,7 @@ void Item_ItemsTime_ResetTimes()
     FOREACH(Items, Item_ItemsTime_Allow(it), {
         it_times[it.m_id] = (it_times[it.m_id] == -1) ? -1 : 0;
     });
     FOREACH(Items, Item_ItemsTime_Allow(it), {
         it_times[it.m_id] = (it_times[it.m_id] == -1) ? -1 : 0;
     });

-    it_times[Items_MAX] = (it_times[Items_MAX] == -1) ? -1 : 0;
+    it_times[REGISTRY_MAX(Items)] = (it_times[REGISTRY_MAX(Items)] == -1) ? -1 : 0;

 }
 
 void Item_ItemsTime_ResetTimesForPlayer(entity e)
 }
 
 void Item_ItemsTime_ResetTimesForPlayer(entity e)


@@ -93,7 +93,7 @@ void Item_ItemsTime_ResetTimesForPlayer(entity e)
     FOREACH(Items, Item_ItemsTime_Allow(it), {
         IT_Write(e, it.m_id, (it_times[it.m_id] == -1) ? -1 : 0);
     });
     FOREACH(Items, Item_ItemsTime_Allow(it), {
         IT_Write(e, it.m_id, (it_times[it.m_id] == -1) ? -1 : 0);
     });

-    IT_Write(e, Items_MAX, (it_times[Items_MAX] == -1) ? -1 : 0);
+    IT_Write(e, REGISTRY_MAX(Items), (it_times[REGISTRY_MAX(Items)] == -1) ? -1 : 0);

 }
 
 void Item_ItemsTime_SetTimesForPlayer(entity e)
 }
 
 void Item_ItemsTime_SetTimesForPlayer(entity e)


@@ -101,7 +101,7 @@ void Item_ItemsTime_SetTimesForPlayer(entity e)
     FOREACH(Items, Item_ItemsTime_Allow(it), {
         IT_Write(e, it.m_id, it_times[it.m_id]);
     });
     FOREACH(Items, Item_ItemsTime_Allow(it), {
         IT_Write(e, it.m_id, it_times[it.m_id]);
     });

-    IT_Write(e, Items_MAX, it_times[Items_MAX]);
+    IT_Write(e, REGISTRY_MAX(Items), it_times[REGISTRY_MAX(Items)]);

 }
 
 void Item_ItemsTime_SetTime(entity e, float t)
 }
 
 void Item_ItemsTime_SetTime(entity e, float t)


@@ -115,7 +115,7 @@ void Item_ItemsTime_SetTime(entity e, float t)
                if (!item.instanceOfWeaponPickup)
                        it_times[item.m_id] = t;
                else if (STAT(WEAPONS, e) & WEPSET_SUPERWEAPONS)
                if (!item.instanceOfWeaponPickup)
                        it_times[item.m_id] = t;
                else if (STAT(WEAPONS, e) & WEPSET_SUPERWEAPONS)

-                       it_times[Items_MAX] = t;
+                       it_times[REGISTRY_MAX(Items)] = t;

     }
 }
 
     }
 }
 


@@ -295,21 +295,21 @@ void HUD_ItemsTime()
         FOREACH(Items, Item_ItemsTime_Allow(it), {
             count += (Item_ItemsTime_GetTime(it.m_id) > time || -Item_ItemsTime_GetTime(it.m_id) > time);
         });
         FOREACH(Items, Item_ItemsTime_Allow(it), {
             count += (Item_ItemsTime_GetTime(it.m_id) > time || -Item_ItemsTime_GetTime(it.m_id) > time);
         });

-        count += (Item_ItemsTime_GetTime(Items_MAX) > time || -Item_ItemsTime_GetTime(Items_MAX) > time);
+        count += (Item_ItemsTime_GetTime(REGISTRY_MAX(Items)) > time || -Item_ItemsTime_GetTime(REGISTRY_MAX(Items)) > time);

     }
     else if (autocvar_hud_panel_itemstime_hidespawned == 2)
     {
         FOREACH(Items, Item_ItemsTime_Allow(it), {
             count += (Item_ItemsTime_GetTime(it.m_id) > time);
         });
     }
     else if (autocvar_hud_panel_itemstime_hidespawned == 2)
     {
         FOREACH(Items, Item_ItemsTime_Allow(it), {
             count += (Item_ItemsTime_GetTime(it.m_id) > time);
         });

-        count += (Item_ItemsTime_GetTime(Items_MAX) > time);
+        count += (Item_ItemsTime_GetTime(REGISTRY_MAX(Items)) > time);

     }
     else
     {
         FOREACH(Items, Item_ItemsTime_Allow(it), {
             count += (Item_ItemsTime_GetTime(it.m_id) != -1);
         });
     }
     else
     {
         FOREACH(Items, Item_ItemsTime_Allow(it), {
             count += (Item_ItemsTime_GetTime(it.m_id) != -1);
         });

-        count += (Item_ItemsTime_GetTime(Items_MAX) != -1);
+        count += (Item_ItemsTime_GetTime(REGISTRY_MAX(Items)) != -1);

     }
     if (count == 0)
         return;
     }
     if (count == 0)
         return;


@@ -426,13 +426,13 @@ LABEL(iteration)
             row = 0;
             column = column + 1;
         }
             row = 0;
             column = column + 1;
         }

-        if(id == Items_MAX) // can happen only in the last fake iteration
+        if(id == REGISTRY_MAX(Items)) // can happen only in the last fake iteration

                break;
     });
     // add another fake iteration for superweapons time
                break;
     });
     // add another fake iteration for superweapons time

-    if(id < Items_MAX && Item_ItemsTime_GetTime(Items_MAX) != -1)
+    if(id < REGISTRY_MAX(Items) && Item_ItemsTime_GetTime(REGISTRY_MAX(Items)) != -1)

     {
     {

-               id = Items_MAX;
+               id = REGISTRY_MAX(Items);

                icon = "superweapons";
                goto iteration;
     }
                icon = "superweapons";
                goto iteration;
     }

diff --git a/qcsrc/common/mutators/mutator/stale_move_negation/sv_stale_move_negation.qc b/qcsrc/common/mutators/mutator/stale_move_negation/sv_stale_move_negation.qc
index c54a8a69306f4d7682be9e71003d584dca762a73..04785f8d69c99c7c02205c2c6028fe78b2a3af25 100644 (file)
--- a/qcsrc/common/mutators/mutator/stale_move_negation/sv_stale_move_negation.qc
+++ b/qcsrc/common/mutators/mutator/stale_move_negation/sv_stale_move_negation.qc
@@ -14,7 +14,7 @@ MUTATOR_HOOKFUNCTION(mutator_smneg, BuildMutatorsPrettyString) {
     M_ARGV(0, string) = strcat(M_ARGV(0, string), ", Stale-move negation");
 }
 
     M_ARGV(0, string) = strcat(M_ARGV(0, string), ", Stale-move negation");
 }
 

-.float x_smneg_weight[Weapons_MAX];
+.float x_smneg_weight[REGISTRY_MAX(Weapons)];

 
 float smneg_multiplier(float weight) {
     float a = autocvar_g_smneg_bonus_asymptote;
 
 float smneg_multiplier(float weight) {
     float a = autocvar_g_smneg_bonus_asymptote;

diff --git a/qcsrc/common/turrets/all.qh b/qcsrc/common/turrets/all.qh
index 9dedc89cb780253a184b45ed3f1dba2da1744d9b..ee0e1918e4b9194c3d5f75b510d864095476b81e 100644 (file)
--- a/qcsrc/common/turrets/all.qh
+++ b/qcsrc/common/turrets/all.qh
@@ -112,7 +112,7 @@ GENERIC_COMMAND(dumpturrets, "Dump all turrets into turrets_dump.txt", false)
 
 
 const int TUR_FIRST = 1;
 
 
 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)
 
 
 #define REGISTER_TURRET(id, inst) REGISTER(Turrets, TUR, id, m_id, inst)
 

diff --git a/qcsrc/common/turrets/config.qc b/qcsrc/common/turrets/config.qc
index 19b64ff07233abd2f112fac5aeb168be184a7f16..8ecd190e320753a3f6a21af398df40ceb8721fb0 100644 (file)
--- a/qcsrc/common/turrets/config.qc
+++ b/qcsrc/common/turrets/config.qc
@@ -77,7 +77,7 @@ void Dump_Turret_Settings()
 
        // extra information
        if (TUR_CONFIG_COUNT <= MAX_CONFIG_SETTINGS - 1)
 
        // extra information
        if (TUR_CONFIG_COUNT <= MAX_CONFIG_SETTINGS - 1)

-               LOG_INFOF("Totals: %d turrets, %d settings", (Turrets_COUNT - 1), totalsettings);
+               LOG_INFOF("Totals: %d turrets, %d settings", (REGISTRY_COUNT(Turrets) - 1), totalsettings);

 
        // clear queue now that we're finished
        TUR_CONFIG_COUNT = 0;
 
        // clear queue now that we're finished
        TUR_CONFIG_COUNT = 0;

diff --git a/qcsrc/common/vehicles/all.qh b/qcsrc/common/vehicles/all.qh
index ed44be777bf369acd3cc2ad697b89cb03b5bfd11..94af40c66ffc9f3ca50a30467b884d54d2b26f96 100644 (file)
--- a/qcsrc/common/vehicles/all.qh
+++ b/qcsrc/common/vehicles/all.qh
@@ -8,7 +8,7 @@ REGISTER_REGISTRY(Vehicles)
 REGISTRY_CHECK(Vehicles)
 
 const int VEH_FIRST = 1;
 REGISTRY_CHECK(Vehicles)
 
 const int VEH_FIRST = 1;

-#define VEH_LAST (Vehicles_COUNT - 1)
+#define VEH_LAST (REGISTRY_COUNT(Vehicles) - 1)

 
 #define REGISTER_VEHICLE(id, inst) REGISTER(Vehicles, VEH, id, vehicleid, inst)
 
 
 #define REGISTER_VEHICLE(id, inst) REGISTER(Vehicles, VEH, id, vehicleid, inst)
 

diff --git a/qcsrc/common/weapons/all.qc b/qcsrc/common/weapons/all.qc
index a8d1376d1d86b60781be17f990ff41f835f88996..45ba22906e042185002f639456f96558972ad455 100644 (file)
--- a/qcsrc/common/weapons/all.qc
+++ b/qcsrc/common/weapons/all.qc
@@ -59,11 +59,11 @@
 WepSet _WepSet_FromWeapon(int a)
 {
        a -= WEP_FIRST;
 WepSet _WepSet_FromWeapon(int a)
 {
        a -= WEP_FIRST;

-       if (Weapons_MAX > 24)
+       if (REGISTRY_MAX(Weapons) > 24)

                if (a >= 24)
                {
                        a -= 24;
                if (a >= 24)
                {
                        a -= 24;

-                       if (Weapons_MAX > 48)
+                       if (REGISTRY_MAX(Weapons) > 48)

                                if (a >= 24)
                                {
                                        a -= 24;
                                if (a >= 24)
                                {
                                        a -= 24;


@@ -76,8 +76,8 @@ WepSet _WepSet_FromWeapon(int a)
 #ifdef SVQC
        void WriteWepSet(float dst, WepSet w)
        {
 #ifdef SVQC
        void WriteWepSet(float dst, WepSet w)
        {

-               if (Weapons_MAX > 48) WriteInt72_t(dst, w);
-               else if (Weapons_MAX > 24) WriteInt48_t(dst, w);
+               if (REGISTRY_MAX(Weapons) > 48) WriteInt72_t(dst, w);
+               else if (REGISTRY_MAX(Weapons) > 24) WriteInt48_t(dst, w);

                else WriteInt24_t(dst, w.x);
        }
 #endif
                else WriteInt24_t(dst, w.x);
        }
 #endif


@@ -92,8 +92,8 @@ WepSet _WepSet_FromWeapon(int a)
        }
        WepSet ReadWepSet()
        {
        }
        WepSet ReadWepSet()
        {

-               if (Weapons_MAX > 48) return ReadInt72_t();
-               if (Weapons_MAX > 24) return ReadInt48_t();
+               if (REGISTRY_MAX(Weapons) > 48) return ReadInt72_t();
+               if (REGISTRY_MAX(Weapons) > 24) return ReadInt48_t();

                return ReadInt24_t() * '1 0 0';
        }
 #endif
                return ReadInt24_t() * '1 0 0';
        }
 #endif


@@ -144,7 +144,7 @@ string W_NumberWeaponOrder(string order)
        return mapPriorityList(order, W_NumberWeaponOrder_MapFunc);
 }
 
        return mapPriorityList(order, W_NumberWeaponOrder_MapFunc);
 }
 

-float W_FixWeaponOrder_BuildImpulseList_buf[Weapons_MAX];
+float W_FixWeaponOrder_BuildImpulseList_buf[REGISTRY_MAX(Weapons)];

 string W_FixWeaponOrder_BuildImpulseList_order;
 void W_FixWeaponOrder_BuildImpulseList_swap(int i, int j, entity pass)
 {
 string W_FixWeaponOrder_BuildImpulseList_order;
 void W_FixWeaponOrder_BuildImpulseList_swap(int i, int j, entity pass)
 {

diff --git a/qcsrc/common/weapons/all.qh b/qcsrc/common/weapons/all.qh
index 26b40084bfe82b4013862d1d6c4fae03621c74ff..e82dce3da57d68d273f5b292ae4a46afb32a1867 100644 (file)
--- a/qcsrc/common/weapons/all.qh
+++ b/qcsrc/common/weapons/all.qh
@@ -297,7 +297,7 @@ const .float reloading_time = reload_time;
 #define WEP_CVAR_BOTH(wepname, isprimary, name) ((isprimary) ? WEP_CVAR_PRI(wepname, name) : WEP_CVAR_SEC(wepname, name))
 
 const int WEP_FIRST = 1;
 #define WEP_CVAR_BOTH(wepname, isprimary, name) ((isprimary) ? WEP_CVAR_PRI(wepname, name) : WEP_CVAR_SEC(wepname, name))
 
 const int WEP_FIRST = 1;

-#define WEP_LAST (Weapons_COUNT - 1)
+#define WEP_LAST (REGISTRY_COUNT(Weapons) - 1)

 WepSet WEPSET_ALL;
 WepSet WEPSET_SUPERWEAPONS;
 
 WepSet WEPSET_ALL;
 WepSet WEPSET_SUPERWEAPONS;
 


@@ -308,7 +308,7 @@ WepSet WEPSET_SUPERWEAPONS;
 
 // TODO: invert after 0.8.2. Will require moving 'best weapon' impulses
 #define WEP_IMPULSE_BEGIN 230
 
 // TODO: invert after 0.8.2. Will require moving 'best weapon' impulses
 #define WEP_IMPULSE_BEGIN 230

-#define WEP_IMPULSE_END bound(WEP_IMPULSE_BEGIN, WEP_IMPULSE_BEGIN + (Weapons_COUNT - 1) - 1, 253)
+#define WEP_IMPULSE_END bound(WEP_IMPULSE_BEGIN, WEP_IMPULSE_BEGIN + (REGISTRY_COUNT(Weapons) - 1) - 1, 253)

 
 REGISTRY_SORT(Weapons, WEP_HARDCODED_IMPULSES + 1)
 REGISTRY_CHECK(Weapons)
 
 REGISTRY_SORT(Weapons, WEP_HARDCODED_IMPULSES + 1)
 REGISTRY_CHECK(Weapons)


@@ -332,7 +332,7 @@ STATIC_INIT(register_weapons_done)
     FOREACH(Weapons, true, it.wr_init(it));
     #endif
     weaponorder_byid = "";
     FOREACH(Weapons, true, it.wr_init(it));
     #endif
     weaponorder_byid = "";

-    for (int i = Weapons_MAX - 1; i >= 1; --i)
+    for (int i = REGISTRY_MAX(Weapons) - 1; i >= 1; --i)

         if (Weapons_from(i))
             weaponorder_byid = strcat(weaponorder_byid, " ", ftos(i));
     weaponorder_byid = strzone(substring(weaponorder_byid, 1, -1));
         if (Weapons_from(i))
             weaponorder_byid = strcat(weaponorder_byid, " ", ftos(i));
     weaponorder_byid = strzone(substring(weaponorder_byid, 1, -1));

diff --git a/qcsrc/lib/registry.qh b/qcsrc/lib/registry.qh
index a48e83ac1a32593f7ccced9044b55de4308d7b79..b25878c349b71dbd362021321b0166f89e83aac9 100644 (file)
--- a/qcsrc/lib/registry.qh
+++ b/qcsrc/lib/registry.qh
@@ -14,6 +14,8 @@
        #define _R_DEL(r)
 #endif
 
        #define _R_DEL(r)
 #endif
 

+#define REGISTRY_MAX(id) id##_MAX
+#define REGISTRY_COUNT(id) id##_COUNT

 /**
  * Declare a new registry.
  *
 /**
  * Declare a new registry.
  *


@@ -129,14 +131,14 @@ MACRO_END
                entity a = _R_GET(_##id, i), b = _R_GET(_##id, j); \
                _R_SET(_##id, i, b); \
                _R_SET(_##id, j, a); \
                entity a = _R_GET(_##id, i), b = _R_GET(_##id, j); \
                _R_SET(_##id, i, b); \
                _R_SET(_##id, j, a); \

-        \
+               \

                entity a_next = a.REGISTRY_NEXT, b_next = b.REGISTRY_NEXT; \
                a.REGISTRY_NEXT = b_next; \
                b.REGISTRY_NEXT = a_next; \
                entity a_next = a.REGISTRY_NEXT, b_next = b.REGISTRY_NEXT; \
                a.REGISTRY_NEXT = b_next; \
                b.REGISTRY_NEXT = a_next; \

-        \
+               \

                if (i == 0) id##_first = b; \
                else _R_GET(_##id, i - 1).REGISTRY_NEXT = b; \
                if (i == 0) id##_first = b; \
                else _R_GET(_##id, i - 1).REGISTRY_NEXT = b; \

-        \
+               \

                if (j == 0) id##_first = a; \
                else _R_GET(_##id, j - 1).REGISTRY_NEXT = a; \
        } \
                if (j == 0) id##_first = a; \
                else _R_GET(_##id, j - 1).REGISTRY_NEXT = a; \
        } \


@@ -201,6 +203,6 @@ void Registry_send(string id, string hash);
        ENDCLASS(id##Registry) \
        REGISTER(Registries, REGISTRY, id, m_id, NEW(id##Registry)); \
        METHOD(id##Registry, m_reload, void()) { \
        ENDCLASS(id##Registry) \
        REGISTER(Registries, REGISTRY, id, m_id, NEW(id##Registry)); \
        METHOD(id##Registry, m_reload, void()) { \

-           id##_state = 0; \
+               id##_state = 0; \

                Register##id(); \
        }
                Register##id(); \
        }

diff --git a/qcsrc/menu/xonotic/dialog_settings_game.qc b/qcsrc/menu/xonotic/dialog_settings_game.qc
index ba10d276ebfb119b32955dc73b2243e46b9dd414..fc0790d4ba18574691b946aaddd3b21614f30ce0 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_settings_game.qc
+++ b/qcsrc/menu/xonotic/dialog_settings_game.qc
@@ -16,7 +16,7 @@ METHOD(SettingSource, getEntryTooltip, entity(entity this, int i, void(string th
     if (returns) returns(it.titleTooltip);
     return it;
 }
     if (returns) returns(it.titleTooltip);
     return it;
 }

-METHOD(SettingSource, reload, int(entity this, string filter)) { return Settings_COUNT; }
+METHOD(SettingSource, reload, int(entity this, string filter)) { return REGISTRY_COUNT(Settings); }

 
 string XonoticRegisteredSettingsList_cb_name;
 string XonoticRegisteredSettingsList_cb_tooltip;
 
 string XonoticRegisteredSettingsList_cb_name;
 string XonoticRegisteredSettingsList_cb_tooltip;

diff --git a/qcsrc/server/bot/api.qh b/qcsrc/server/bot/api.qh
index f8285f634d82f0b920ead3a79c3af60712a778f6..81baa2c196dd5042c2610de8707282272527797e 100644 (file)
--- a/qcsrc/server/bot/api.qh
+++ b/qcsrc/server/bot/api.qh
@@ -25,9 +25,9 @@ const int WAYPOINTFLAG_NORELINK__DEPRECATED = BIT(20);
 const int WPFLAGMASK_NORELINK = (WAYPOINTFLAG_TELEPORT | WAYPOINTFLAG_LADDER | WAYPOINTFLAG_JUMP | WAYPOINTFLAG_CUSTOM_JP | WAYPOINTFLAG_SUPPORT);
 
 float bot_custom_weapon;
 const int WPFLAGMASK_NORELINK = (WAYPOINTFLAG_TELEPORT | WAYPOINTFLAG_LADDER | WAYPOINTFLAG_JUMP | WAYPOINTFLAG_CUSTOM_JP | WAYPOINTFLAG_SUPPORT);
 
 float bot_custom_weapon;

-float bot_weapons_close[Weapons_MAX];
-float bot_weapons_far[Weapons_MAX];
-float bot_weapons_mid[Weapons_MAX];
+float bot_weapons_close[REGISTRY_MAX(Weapons)];
+float bot_weapons_far[REGISTRY_MAX(Weapons)];
+float bot_weapons_mid[REGISTRY_MAX(Weapons)];

 float skill;
 
 .float bot_tracewalk_time;
 float skill;
 
 .float bot_tracewalk_time;

diff --git a/qcsrc/server/bot/default/bot.qc b/qcsrc/server/bot/default/bot.qc
index 7b30b62dfabbd720111f6cafad9296c231ce7a66..57de9f05cefecc0376946dd8d5ec26ae0017f689 100644 (file)
--- a/qcsrc/server/bot/default/bot.qc
+++ b/qcsrc/server/bot/default/bot.qc
@@ -350,14 +350,14 @@ void bot_custom_weapon_priority_setup()
                        tokens = tokenizebyseparator(W_NumberWeaponOrder(autocvar_bot_ai_custom_weapon_priority_##dist)," "); \
                        bot_weapons_##dist[0] = -1; \
                        c = 0; \
                        tokens = tokenizebyseparator(W_NumberWeaponOrder(autocvar_bot_ai_custom_weapon_priority_##dist)," "); \
                        bot_weapons_##dist[0] = -1; \
                        c = 0; \

-                       for(i = 0; i < tokens && c < Weapons_COUNT; ++i) { \
+                       for(i = 0; i < tokens && c < REGISTRY_COUNT(Weapons); ++i) { \

                                w = stof(argv(i)); \
                                if (w >= WEP_FIRST && w <= WEP_LAST) { \
                                        bot_weapons_##dist[c] = w; \
                                        ++c; \
                                } \
                        } \
                                w = stof(argv(i)); \
                                if (w >= WEP_FIRST && w <= WEP_LAST) { \
                                        bot_weapons_##dist[c] = w; \
                                        ++c; \
                                } \
                        } \

-                       if (c < Weapons_COUNT) \
+                       if (c < REGISTRY_COUNT(Weapons)) \

                                bot_weapons_##dist[c] = -1; \
                } \
        MACRO_END
                                bot_weapons_##dist[c] = -1; \
                } \
        MACRO_END

diff --git a/qcsrc/server/bot/default/havocbot/havocbot.qc b/qcsrc/server/bot/default/havocbot/havocbot.qc
index 6515cc44efad6bdcbb63a6f11c55f16586ed7bab..3d744f7d972762b00fd63d6eba8efb2741593b21 100644 (file)
--- a/qcsrc/server/bot/default/havocbot/havocbot.qc
+++ b/qcsrc/server/bot/default/havocbot/havocbot.qc
@@ -1476,7 +1476,7 @@ void havocbot_chooseweapon(entity this, .entity weaponentity)
 
                // Choose weapons for far distance
                if ( distance > bot_distance_far ) {
 
                // Choose weapons for far distance
                if ( distance > bot_distance_far ) {

-                       for(i=0; i < Weapons_COUNT && bot_weapons_far[i] != -1 ; ++i){
+                       for(i=0; i < REGISTRY_COUNT(Weapons) && bot_weapons_far[i] != -1 ; ++i){

                                w = bot_weapons_far[i];
                                if ( client_hasweapon(this, Weapons_from(w), weaponentity, true, false) )
                                {
                                w = bot_weapons_far[i];
                                if ( client_hasweapon(this, Weapons_from(w), weaponentity, true, false) )
                                {


@@ -1490,7 +1490,7 @@ void havocbot_chooseweapon(entity this, .entity weaponentity)
 
                // Choose weapons for mid distance
                if ( distance > bot_distance_close) {
 
                // Choose weapons for mid distance
                if ( distance > bot_distance_close) {

-                       for(i=0; i < Weapons_COUNT && bot_weapons_mid[i] != -1 ; ++i){
+                       for(i=0; i < REGISTRY_COUNT(Weapons) && bot_weapons_mid[i] != -1 ; ++i){

                                w = bot_weapons_mid[i];
                                if ( client_hasweapon(this, Weapons_from(w), weaponentity, true, false) )
                                {
                                w = bot_weapons_mid[i];
                                if ( client_hasweapon(this, Weapons_from(w), weaponentity, true, false) )
                                {


@@ -1503,7 +1503,7 @@ void havocbot_chooseweapon(entity this, .entity weaponentity)
                }
 
                // Choose weapons for close distance
                }
 
                // Choose weapons for close distance

-               for(i=0; i < Weapons_COUNT && bot_weapons_close[i] != -1 ; ++i){
+               for(i=0; i < REGISTRY_COUNT(Weapons) && bot_weapons_close[i] != -1 ; ++i){

                        w = bot_weapons_close[i];
                        if ( client_hasweapon(this, Weapons_from(w), weaponentity, true, false) )
                        {
                        w = bot_weapons_close[i];
                        if ( client_hasweapon(this, Weapons_from(w), weaponentity, true, false) )
                        {

diff --git a/qcsrc/server/defs.qh b/qcsrc/server/defs.qh
index 9d7421987c1ce254c5ce4da58139214d594a6d53..a8ec77959af89a584a3b4f03b2806a04e2cb37b2 100644 (file)
--- a/qcsrc/server/defs.qh
+++ b/qcsrc/server/defs.qh
@@ -195,7 +195,7 @@ void FixClientCvars(entity e);
 
 float bot_waypoints_for_items;
 
 
 float bot_waypoints_for_items;
 

-.float attack_finished_for[Weapons_MAX * MAX_WEAPONSLOTS];
+.float attack_finished_for[REGISTRY_MAX(Weapons) * MAX_WEAPONSLOTS];

 .float attack_finished_single[MAX_WEAPONSLOTS];
 #if INDEPENDENT_ATTACK_FINISHED
 #define ATTACK_FINISHED_FOR(ent, w, slot) ((ent).(attack_finished_for[((w) - WEP_FIRST) * MAX_WEAPONSLOTS + (slot)]))
 .float attack_finished_single[MAX_WEAPONSLOTS];
 #if INDEPENDENT_ATTACK_FINISHED
 #define ATTACK_FINISHED_FOR(ent, w, slot) ((ent).(attack_finished_for[((w) - WEP_FIRST) * MAX_WEAPONSLOTS + (slot)]))


@@ -296,7 +296,7 @@ string matchid;
 
 bool radar_showennemies;
 
 
 bool radar_showennemies;
 

-.float weapon_load[Weapons_MAX];
+.float weapon_load[REGISTRY_MAX(Weapons)];

 .int ammo_none; // used by the reloading system, must always be 0
 .int clip_load;
 .int old_clip_load;
 .int ammo_none; // used by the reloading system, must always be 0
 .int clip_load;
 .int old_clip_load;

diff --git a/qcsrc/server/weapons/accuracy.qh b/qcsrc/server/weapons/accuracy.qh
index 627698aa217c6f0bb21e4edf534cde9ee823833c..5d10e85bdf8dc5d8d74ed468ca20ffc38f466000 100644 (file)
--- a/qcsrc/server/weapons/accuracy.qh
+++ b/qcsrc/server/weapons/accuracy.qh
@@ -9,12 +9,12 @@ REPLICATE(cvar_cl_accuracy_data_share, bool, "cl_accuracy_data_share");
 REPLICATE(cvar_cl_accuracy_data_receive, bool, "cl_accuracy_data_receive");
 
 .entity accuracy;
 REPLICATE(cvar_cl_accuracy_data_receive, bool, "cl_accuracy_data_receive");
 
 .entity accuracy;

-.float accuracy_frags[Weapons_MAX];
+.float accuracy_frags[REGISTRY_MAX(Weapons)];

 
 

-.float accuracy_hit[Weapons_MAX];
-.float accuracy_fired[Weapons_MAX];
-.float accuracy_cnt_hit[Weapons_MAX];
-.float accuracy_cnt_fired[Weapons_MAX];
+.float accuracy_hit[REGISTRY_MAX(Weapons)];
+.float accuracy_fired[REGISTRY_MAX(Weapons)];
+.float accuracy_cnt_hit[REGISTRY_MAX(Weapons)];
+.float accuracy_cnt_fired[REGISTRY_MAX(Weapons)];

 
 
 // init/free
 
 
 // init/free