X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;ds=sidebyside;f=qcsrc%2Fserver%2Ft_items.qh;h=d93e28bb611053773784fb08612df1f16ba83fdb;hb=86c9dc7c3696c329496b06375c1e79fb407401ce;hp=6b0c317c426daa248c9092b109f992c57858f5db;hpb=7d31226bcb7eb09c889f3a817562270573f32c66;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/t_items.qh b/qcsrc/server/t_items.qh
index 6b0c317c4..d93e28bb6 100644
--- a/qcsrc/server/t_items.qh
+++ b/qcsrc/server/t_items.qh
@@ -1,3 +1,6 @@
+#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.
@@ -7,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;
@@ -19,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;
@@ -60,6 +62,9 @@ const int ISF_SIZE 				= 128;
 
 .int ItemStatus;
 
+.float fade_start;
+.float fade_end;
+
 #ifdef CSQC
 
 float  autocvar_cl_animate_items = 1;
@@ -81,8 +86,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);
@@ -123,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 to, int sf);
 void ItemUpdate(entity item);
 
 // pickup evaluation functions
@@ -136,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);
 
 
@@ -166,3 +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