]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/blobdiff - qcsrc/server/t_items.qh
Draw: purge SELFPARAM
[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / t_items.qh
index c31f226f6cd57e7d52eba91bc32f28a25d9487bc..dd79b1788f2b14fbf451b5b4ee01f16d1f2ea3c6 100644 (file)
@@ -1,103 +1,6 @@
 #ifndef T_ITEMS_H
 #define T_ITEMS_H
 
-#if defined(CSQC)
-       #include "../common/util-pre.qh"
-       #include "../client/sys-pre.qh"
-       #include "../dpdefs/csprogsdefs.qh"
-       #include "../client/sys-post.qh"
-       #include "../client/defs.qh"
-       #include "../dpdefs/keycodes.qh"
-       #include "../common/constants.qh"
-       #include "../common/stats.qh"
-       #include "../warpzonelib/anglestransform.qh"
-       #include "../warpzonelib/mathlib.qh"
-       #include "../warpzonelib/common.qh"
-       #include "../warpzonelib/client.qh"
-       #include "../common/playerstats.qh"
-       #include "../common/teams.qh"
-       #include "../common/util.qh"
-       #include "../common/nades.qh"
-       #include "../common/buffs.qh"
-       #include "../common/test.qh"
-       #include "../common/counting.qh"
-       #include "../common/weapons/weapons.qh"
-       #include "../common/mapinfo.qh"
-       #include "../common/command/markup.qh"
-       #include "../common/command/rpn.qh"
-       #include "../common/command/generic.qh"
-       #include "../common/command/shared_defs.qh"
-       #include "../common/urllib.qh"
-       #include "../common/animdecide.qh"
-       #include "../client/command/cl_cmd.qh"
-       #include "../common/monsters/monsters.qh"
-       #include "../client/autocvars.qh"
-       #include "../common/notifications.qh"
-       #include "../common/deathtypes.qh"
-       #include "../client/damage.qh"
-       #include "../csqcmodellib/interpolate.qh"
-       #include "../client/teamradar.qh"
-       #include "../client/hud.qh"
-       #include "../client/scoreboard.qh"
-       #include "../client/waypointsprites.qh"
-       #include "../client/movetypes.qh"
-       #include "../client/prandom.qh"
-       #include "../client/bgmscript.qh"
-       #include "../client/noise.qh"
-       #include "../client/tturrets.qh"
-       #include "tturrets/include/turrets_early.qh"
-       #include "../client/main.qh"
-       #include "../client/vehicles/vehicles.qh"
-       #include "../common/csqcmodel_settings.qh"
-       #include "../csqcmodellib/common.qh"
-       #include "../csqcmodellib/cl_model.qh"
-       #include "../csqcmodellib/cl_player.qh"
-       #include "../client/weapons/projectile.qh"
-       #include "../client/player_skeleton.qh"
-#elif defined(MENUQC)
-#elif defined(SVQC)
-       #include "../common/util-pre.qh"
-    #include "sys-pre.qh"
-    #include "../dpdefs/progsdefs.qh"
-    #include "../dpdefs/dpextensions.qh"
-    #include "sys-post.qh"
-    #include "../warpzonelib/anglestransform.qh"
-    #include "../warpzonelib/mathlib.qh"
-    #include "../warpzonelib/common.qh"
-    #include "../warpzonelib/util_server.qh"
-    #include "../warpzonelib/server.qh"
-    #include "../common/constants.qh"
-    #include "../common/stats.qh"
-    #include "../common/teams.qh"
-    #include "../common/util.qh"
-    #include "../common/nades.qh"
-    #include "../common/buffs.qh"
-    #include "../common/test.qh"
-    #include "../common/counting.qh"
-    #include "../common/urllib.qh"
-    #include "../common/command/markup.qh"
-    #include "../common/command/rpn.qh"
-    #include "../common/command/generic.qh"
-    #include "../common/command/shared_defs.qh"
-    #include "../common/net_notice.qh"
-    #include "../common/animdecide.qh"
-    #include "../common/monsters/monsters.qh"
-    #include "../common/monsters/sv_monsters.qh"
-    #include "../common/monsters/spawn.qh"
-    #include "../common/weapons/config.qh"
-    #include "../common/weapons/weapons.qh"
-    #include "weapons/accuracy.qh"
-    #include "weapons/common.qh"
-    #include "weapons/csqcprojectile.qh"
-    #include "weapons/hitplot.qh"
-    #include "weapons/selection.qh"
-    #include "weapons/spawning.qh"
-    #include "weapons/throwing.qh"
-    #include "weapons/tracing.qh"
-    #include "weapons/weaponstats.qh"
-    #include "weapons/weaponsystem.qh"
-#endif
-
 // 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.
@@ -107,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;
@@ -119,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;
@@ -160,6 +62,9 @@ const int ISF_SIZE                           = 128;
 
 .int ItemStatus;
 
+.float fade_start;
+.float fade_end;
+
 #ifdef CSQC
 
 float  autocvar_cl_animate_items = 1;
@@ -173,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);
@@ -223,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
@@ -236,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);
 
 
@@ -266,4 +179,4 @@ void GiveRot(entity e, float v0, float v1, .float rotfield, float rottime, .floa
 
 float GiveItems(entity e, float beginarg, float endarg);
 #endif
-#endif
\ No newline at end of file
+#endif