Draw: purge SELFPARAM

[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..dd79b1788f2b14fbf451b5b4ee01f16d1f2ea3c6 100644 (file)
--- a/qcsrc/server/t_items.qh
+++ b/qcsrc/server/t_items.qh
@@ -10,10 +10,14 @@ 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;
+// -Wdouble-declaration
+#define IT_SHELLS                                        256
+// -Wdouble-declaration
+#define IT_NAILS                                         512
+// -Wdouble-declaration
+#define IT_ROCKETS                                      1024
+// -Wdouble-declaration
+#define IT_CELLS                                        2048
 const int IT_SUPERWEAPON                               =    4096;
 const int IT_STRENGTH                                  =    8192;
 const int IT_INVINCIBLE                                =   16384;
@@ -22,15 +26,10 @@ 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;
+       // -Wdouble-declaration
+       #define IT_KEY1                                                 131072
+       // -Wdouble-declaration
+       #define IT_KEY2                                                 262144
 // end
 
 const int IT_5HP                               =  524288;
@@ -63,6 +62,9 @@ const int ISF_SIZE                            = 128;
 
 .int ItemStatus;
 
+.float fade_start;
+.float fade_end;
+
 #ifdef CSQC
 
 float  autocvar_cl_animate_items = 1;
@@ -76,16 +78,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 +135,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 +148,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);