Merge branch 'master' into divVerent/4team_ctf

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

diff --git a/qcsrc/common/items.qc b/qcsrc/common/items.qc
index d7293ef69d53fe15aac7e31c079125efd2322d28..c961895d95c157aac7ad2439541f9babbd82f557 100644 (file)
--- a/qcsrc/common/items.qc
+++ b/qcsrc/common/items.qc
@@ -8,7 +8,7 @@ void register_weapon(float id, float(float) func, float ammotype, float i, float
        weapon_info[id - 1] = e = spawn();
        e.classname = "weapon_info";
        e.weapon = id;
-       e.weapons = power2of(id - WEP_FIRST);
+       WEPSET_COPY_EW(e, id);
        e.netname = shortname;
        e.message = wname;
        e.items = ammotype;
@@ -41,9 +41,9 @@ void register_weapons_done()
        dummy_weapon_info = spawn();
        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
+       WEPSET_CLEAR_E(dummy_weapon_info);
        dummy_weapon_info.netname = "";
-       dummy_weapon_info.message = "@!#%'n Tuba";
+       dummy_weapon_info.message = "AOL CD Thrower";
        dummy_weapon_info.items = 0;
        dummy_weapon_info.weapon_func = w_null;
        dummy_weapon_info.mdl = "";
@@ -172,3 +172,13 @@ void W_RandomWeapons(entity e, float n)
        }
        WEPSET_COPY_EA(e, result);
 }
+
+string W_Name(float weaponid)
+{
+       return (get_weaponinfo(weaponid)).message;
+}
+
+float W_AmmoItemCode(float wpn)
+{
+       return (get_weaponinfo(wpn)).items & IT_AMMO;
+}