Merge remote branch 'remotes/origin/terencehill/newpanelhud' into terencehill/newpanelhud

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

diff --git a/qcsrc/common/items.qh b/qcsrc/common/items.qh
index 531a3115baaa8ae9b83a4bff870f90207f3ec233..62f2d8551e7c58716280895cd8c7bbc0ce531745 100644 (file)
--- a/qcsrc/common/items.qh
+++ b/qcsrc/common/items.qh
@@ -49,9 +49,11 @@ float        IT_AMMO                                 = 8064; // IT_SHELLS | IT_NAILS | IT_ROCKETS | IT_CELLS | IT_S
 float  IT_PICKUPMASK           = 51; // IT_FUEL_REGEN | IT_JETPACK | IT_UNLIMITED_AMMO; // strength and invincible are handled separately
 float  IT_UNLIMITED_AMMO       = 3; // IT_UNLIMITED_SUPERWEAPONS | IT_UNLIMITED_WEAPON_AMMO;
 
+float AMMO_COUNT = 4; // amount of ammo types to show in the inventory panel
+
 // variables:
-string weaponpriority_hudselector_0;
-string weaponpriority_hudselector_1;
+string weaponorder_byid;
+string weaponorder_byimpulse;
 
 // functions:
 entity get_weaponinfo(float id);