Merge branch 'master' into terencehill/menu_weaponarena_selection_fix

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / t_items.qh

diff --git a/qcsrc/server/t_items.qh b/qcsrc/server/t_items.qh
index 7470d2f05b70feedf6a15e1a6e06095ec6c2b4c6..35cce6178d8a3ec4ca3078c72f5c4e74251a91de 100644 (file)
--- a/qcsrc/server/t_items.qh
+++ b/qcsrc/server/t_items.qh
@@ -11,13 +11,13 @@ const int IT_FUEL_REGEN                     =      32; // fuel regeneration trigger
 // where is 64... ?
 const int IT_FUEL                                      =     128;
 // -Wdouble-declaration
-// const int IT_SHELLS                                 =     256;
+#define IT_SHELLS                                        256
 // -Wdouble-declaration
-// const int IT_NAILS                                  =     512;
+#define IT_NAILS                                         512
 // -Wdouble-declaration
-// const int IT_ROCKETS                                =    1024;
+#define IT_ROCKETS                                      1024
 // -Wdouble-declaration
-// const int IT_CELLS                                  =    2048;
+#define IT_CELLS                                        2048
 const int IT_SUPERWEAPON                               =    4096;
 const int IT_STRENGTH                                  =    8192;
 const int IT_INVINCIBLE                                =   16384;
@@ -152,6 +152,7 @@ float weapon_pickupevalfunc(entity player, entity item);
 float commodity_pickupevalfunc(entity player, entity item);
 
 .float is_item;
+.entity itemdef;
 void StartItem (string itemmodel, string pickupsound, float defaultrespawntime, float defaultrespawntimejitter, string itemname, float itemid, float weaponid, float itemflags, float(entity player, entity item) pickupevalfunc, float pickupbasevalue);