Merge branch 'TimePath/independent_offhand' into 'master'

[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 bb914234e1c26bf8abfe8d385ce718bc1d36f0de..45b5f9e9c32f9df0352b661a5bf1fea92ee2b03e 100644 (file)
--- a/qcsrc/server/t_items.qh
+++ b/qcsrc/server/t_items.qh
@@ -1,68 +1,33 @@
 #ifndef T_ITEMS_H
 #define T_ITEMS_H
 
-// constants
-const int IT_UNLIMITED_WEAPON_AMMO             =       1; // when this bit is set, using a weapon does not reduce ammo. Checkpoints can give this powerup.
-const int IT_UNLIMITED_SUPERWEAPONS            =       2; // when this bit is set, superweapons don't expire. Checkpoints can give this powerup.
-const int IT_CTF_SHIELDED                      =       4; // set for the flag shield
-const int IT_USING_JETPACK                     =       8; // confirmation that button is pressed
-const int IT_JETPACK                           =      16; // actual item
-const int IT_FUEL_REGEN                        =      32; // fuel regeneration trigger
-// where is 64... ?
-const int IT_FUEL                                      =     128;
-const int IT_SHELLS                                    =     256;
-const int IT_NAILS                                     =     512;
-const int IT_ROCKETS                                   =    1024;
-const int IT_CELLS                                     =    2048;
-const int IT_SUPERWEAPON                               =    4096;
-const int IT_STRENGTH                                  =    8192;
-const int IT_INVINCIBLE                                =   16384;
-const int IT_HEALTH                                    =   32768;
-const int IT_PLASMA                                    =   65536;
-
-// shared value space (union):
-       // for items:
-       const int IT_KEY1                                       =  131072;
-       const int IT_KEY2                                       =  262144;
-       // for players:
-       const int IT_RED_FLAG_TAKEN             =   32768;
-       const int IT_RED_FLAG_LOST              =   65536;
-       const int IT_RED_FLAG_CARRYING          =   98304;
-       const int IT_BLUE_FLAG_TAKEN            =  131072;
-       const int IT_BLUE_FLAG_LOST             =  262144;
-       const int IT_BLUE_FLAG_CARRYING         =  393216;
-// end
-
-const int IT_5HP                               =  524288;
-const int IT_25HP                              = 1048576;
-const int IT_ARMOR_SHARD                       = 2097152;
-const int IT_ARMOR                             = 4194304;
-
-// item masks
-const int IT_AMMO                              =    3968; // IT_FUEL | IT_SHELLS | IT_NAILS | IT_ROCKETS | IT_CELLS | IT_PLASMA;
-const int IT_PICKUPMASK                        =      51; // IT_FUEL_REGEN | IT_JETPACK | IT_UNLIMITED_AMMO; // strength and invincible are handled separately
-const int IT_UNLIMITED_AMMO                    =       3; // IT_UNLIMITED_SUPERWEAPONS | IT_UNLIMITED_WEAPON_AMMO;
-
 const int AMMO_COUNT = 4; // amount of ammo types to show in the inventory panel
 
 // item networking
-const int ISF_LOCATION                         = 2;
-const int ISF_MODEL                            = 4;
-const int ISF_STATUS                   = 8;
-    const int ITS_STAYWEP              = 1;
-    const int ITS_ANIMATE1             = 2;
-    const int ITS_ANIMATE2             = 4;
-    const int ITS_AVAILABLE    = 8;
-    const int ITS_ALLOWFB              = 16;
-    const int ITS_ALLOWSI              = 32;
-    const int ITS_POWERUP              = 64;
-const int ISF_COLORMAP                         = 16;
-const int ISF_DROP                             = 32;
-const int ISF_ANGLES                   = 64;
-const int ISF_SIZE                             = 128;
+const int ISF_LOCATION                         = BIT(1);
+const int ISF_MODEL                            = BIT(2);
+const int ISF_STATUS                   = BIT(3);
+    const int ITS_STAYWEP                  = BIT(0);
+    const int ITS_ANIMATE1                 = BIT(1);
+    const int ITS_ANIMATE2                 = BIT(2);
+    const int ITS_AVAILABLE        = BIT(3);
+    const int ITS_ALLOWFB                  = BIT(4);
+    const int ITS_ALLOWSI                  = BIT(5);
+    const int ITS_POWERUP                  = BIT(6);
+const int ISF_COLORMAP                         = BIT(4);
+const int ISF_DROP                             = BIT(5);
+const int ISF_ANGLES                   = BIT(6);
+const int ISF_SIZE                             = BIT(7);
 
 .int ItemStatus;
 
+.float fade_start;
+.float fade_end;
+
+#ifdef SVQC
+void StartItemA (entity a);
+#endif
+
 #ifdef CSQC
 
 float  autocvar_cl_animate_items = 1;
@@ -76,16 +41,23 @@ string autocvar_cl_simpleitems_postfix = "_simple";
 .float  spawntime;
 .float  gravity;
 .vector colormod;
-void ItemDraw();
 
-void ItemDrawSimple();
+void ItemDraw(entity this);
+void ItemDrawSimple(entity this);
 
 void ItemRead(float _IsNew);
 
 #endif
 #ifdef SVQC
+spawnfunc(item_strength);
+spawnfunc(item_invincible);
+spawnfunc(item_armor_small);
+spawnfunc(item_shells);
+spawnfunc(item_bullets);
+spawnfunc(item_rockets);
+
 float autocvar_sv_simple_items;
-float ItemSend(entity to, float sf);
+bool ItemSend(entity this, entity to, int sf);
 
 
 float have_pickup_item(void);
@@ -126,7 +98,7 @@ void Item_FindTeam();
 // Savage: used for item garbage-collection
 // TODO: perhaps nice special effect?
 
-float ItemSend(entity to, float sf);
+bool ItemSend(entity this, entity to, int sf);
 void ItemUpdate(entity item);
 
 // pickup evaluation functions
@@ -139,6 +111,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);