Merge branch 'master' into fruitiex/fruitbalance

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / items.qc

diff --git a/qcsrc/common/items.qc b/qcsrc/common/items.qc
index e9ff4452a8f22eddc788e18c8b65a13eef0ca593..33b48371502aaa00f1cdb922fe53cd6f3662a789 100644 (file)
--- a/qcsrc/common/items.qc
+++ b/qcsrc/common/items.qc
@@ -32,40 +32,41 @@ void register_weapons_done()
        dummy_weapon_info.classname = "weapon_info";
        dummy_weapon_info.weapon = 0; // you can recognize dummies by this
        dummy_weapon_info.weapons = 0; // you can recognize dummies by this too
-       dummy_weapon_info.netname = "@!#%'n Tuba";
+       dummy_weapon_info.netname = "";
+       dummy_weapon_info.message = "@!#%'n Tuba";
        dummy_weapon_info.items = 0;
        dummy_weapon_info.weapon_func = w_null;
        dummy_weapon_info.mdl = "";
        dummy_weapon_info.model = "";
        dummy_weapon_info.spawnflags = 0;
+       dummy_weapon_info.model2 = "";
        dummy_weapon_info.impulse = -1;
        dummy_weapon_info.bot_pickupbasevalue = 0;
-       dummy_weapon_info.model2 = "";
 
        float i;
-       weaponpriority_hudselector_0 = "";
+       weaponorder_byid = "";
        for(i = 24; i >= 1; --i)
                if(weapon_info[i-1])
-                       weaponpriority_hudselector_0 = strcat(weaponpriority_hudselector_0, " ", ftos(i));
+                       weaponorder_byid = strcat(weaponorder_byid, " ", ftos(i));
 
        float imp;
-       weaponpriority_hudselector_1 = "";
+       weaponorder_byimpulse = "";
        for(i = 1; i <= 24; ++i)
        {
                wi = weapon_info[i-1];
                if(wi && wi.impulse == 0)
-                       weaponpriority_hudselector_1 = strcat(weaponpriority_hudselector_1, " ", ftos(i));
+                       weaponorder_byimpulse = strcat(weaponorder_byimpulse, " ", ftos(i));
        }
        for(imp = 9; imp > 0; --imp)
                for(i = 1; i <= 24; ++i)
                {
                        wi = weapon_info[i-1];
                        if(wi && wi.impulse == imp)
-                               weaponpriority_hudselector_1 = strcat(weaponpriority_hudselector_1, " ", ftos(i));
+                               weaponorder_byimpulse = strcat(weaponorder_byimpulse, " ", ftos(i));
                }
 
-       weaponpriority_hudselector_0 = strzone(substring(weaponpriority_hudselector_0, 1, strlen(weaponpriority_hudselector_0) - 1));
-       weaponpriority_hudselector_1 = strzone(substring(weaponpriority_hudselector_1, 1, strlen(weaponpriority_hudselector_1) - 1));
+       weaponorder_byid = strzone(substring(weaponorder_byid, 1, strlen(weaponorder_byid) - 1));
+       weaponorder_byimpulse = strzone(substring(weaponorder_byimpulse, 1, strlen(weaponorder_byimpulse) - 1));
 }
 entity get_weaponinfo(float id)
 {