Merge branch 'terencehill/vehicle_hud_fix' 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 26aa170b37fb369053f93b6a4f1242bdd9d2238f..a33e45a82c388acbb55dd9cf59fe4c1819752803 100644 (file)
--- a/qcsrc/server/t_items.qh
+++ b/qcsrc/server/t_items.qh
@@ -1,45 +1,53 @@
+#ifndef T_ITEMS_H
+#define T_ITEMS_H
+
 // constants
-#define WANT_CONST /* we WANT these to be constant, but it conflicts with the declaration in dpdefs/progsdefs.qc */
-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
+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;
-WANT_CONST int IT_SHELLS                       =     256;
-WANT_CONST int IT_NAILS                        =     512;
-WANT_CONST int IT_ROCKETS                      =    1024;
-WANT_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;
+const int IT_FUEL                                      =     128;
+// -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;
+const int IT_HEALTH                                    =   32768;
+const int IT_PLASMA                                    =   65536;
 
 // shared value space (union):
        // for items:
-       WANT_CONST int IT_KEY1                          =  131072;
-       WANT_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;
-       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;
+       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;
+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 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
 
@@ -63,14 +71,14 @@ const int ISF_SIZE                          = 128;
 
 #ifdef CSQC
 
-var float  autocvar_cl_animate_items = 1;
-var float  autocvar_cl_ghost_items = 0.45;
-var vector autocvar_cl_ghost_items_color = '-1 -1 -1';
-var float  autocvar_cl_fullbright_items = 0;
-var vector autocvar_cl_weapon_stay_color = '2 0.5 0.5';
-var float  autocvar_cl_weapon_stay_alpha = 0.75;
-var float  autocvar_cl_simple_items = 0;
-var string autocvar_cl_simpleitems_postfix = "_simple";
+float  autocvar_cl_animate_items = 1;
+float  autocvar_cl_ghost_items = 0.45;
+vector autocvar_cl_ghost_items_color = '-1 -1 -1';
+float  autocvar_cl_fullbright_items = 0;
+vector autocvar_cl_weapon_stay_color = '2 0.5 0.5';
+float  autocvar_cl_weapon_stay_alpha = 0.75;
+float  autocvar_cl_simple_items = 0;
+string autocvar_cl_simpleitems_postfix = "_simple";
 .float  spawntime;
 .float  gravity;
 .vector colormod;
@@ -82,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);
@@ -124,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
@@ -167,3 +182,4 @@ void GiveRot(entity e, float v0, float v1, .float rotfield, float rottime, .floa
 
 float GiveItems(entity e, float beginarg, float endarg);
 #endif
+#endif