Merge branch 'master' into Mario/qc_physics_prehax

[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..a33e45a82c388acbb55dd9cf59fe4c1819752803 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,8 +26,10 @@ const int IT_PLASMA                                  =   65536;
 
 // shared value space (union):
        // for items:
-       const int IT_KEY1                                       =  131072;
-       const int IT_KEY2                                       =  262144;
+       // -Wdouble-declaration
+       #define IT_KEY1                                                 131072
+       // -Wdouble-declaration
+       #define IT_KEY2                                                 262144
        // for players:
        const int IT_RED_FLAG_TAKEN             =   32768;
        const int IT_RED_FLAG_LOST              =   65536;
@@ -84,8 +90,15 @@ void ItemRead(float _IsNew);
 
 #endif
 #ifdef SVQC
+void spawnfunc_item_strength();
+void spawnfunc_item_invincible();
+void spawnfunc_item_armor_small();
+void spawnfunc_item_shells();
+void spawnfunc_item_bullets();
+void spawnfunc_item_rockets();
+
 float autocvar_sv_simple_items;
-float ItemSend(entity to, float sf);
+bool ItemSend(entity to, int sf);
 
 
 float have_pickup_item(void);
@@ -126,7 +139,7 @@ void Item_FindTeam();
 // Savage: used for item garbage-collection
 // TODO: perhaps nice special effect?
 
-float ItemSend(entity to, float sf);
+bool ItemSend(entity to, int sf);
 void ItemUpdate(entity item);
 
 // pickup evaluation functions