X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;ds=sidebyside;f=qcsrc%2Fcommon%2Ft_items.qh;h=e52604d994e97c1bf970394d083e1357550f31e6;hb=refs%2Fmerge-requests%2F472%2Fhead;hp=5ebc9d7e6234f4e8bd06d1233f0584a91946a254;hpb=edf01df130d0d1877461561178b8833a9ab6051c;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/common/t_items.qh b/qcsrc/common/t_items.qh
index 5ebc9d7e6..e52604d99 100644
--- a/qcsrc/common/t_items.qh
+++ b/qcsrc/common/t_items.qh
@@ -1,5 +1,8 @@
-#ifndef T_ITEMS_H
-#define T_ITEMS_H
+#pragma once
+
+#ifdef SVQC
+#include <server/defs.qh>
+#endif
 
 const int AMMO_COUNT = 4; // amount of ammo types to show in the inventory panel
 
@@ -13,7 +16,7 @@ const int ISF_STATUS 			= BIT(3);
     const int ITS_AVAILABLE 	    = BIT(3);
     const int ITS_ALLOWFB 		    = BIT(4);
     const int ITS_ALLOWSI 		    = BIT(5);
-    const int ITS_POWERUP 		    = BIT(6);
+    const int ITS_GLOW   		    = BIT(6);
 const int ISF_COLORMAP 			= BIT(4);
 const int ISF_DROP 				= BIT(5);
 const int ISF_ANGLES 			= BIT(6);
@@ -21,6 +24,7 @@ const int ISF_SIZE 				= BIT(7);
 
 .int ItemStatus;
 
+.float onground_time;
 .float fade_start;
 .float fade_end;
 
@@ -30,6 +34,7 @@ void StartItem(entity this, entity a);
 
 #ifdef CSQC
 
+bool   autocvar_cl_items_nofade;
 float  autocvar_cl_animate_items = 1;
 float  autocvar_cl_ghost_items = 0.45;
 vector autocvar_cl_ghost_items_color = '-1 -1 -1';
@@ -88,7 +93,7 @@ float Item_GiveAmmoTo(entity item, entity player, .float ammotype, float ammomax
 
 float Item_GiveTo(entity item, entity player);
 
-void Item_Touch(entity this);
+void Item_Touch(entity this, entity toucher);
 
 void Item_Reset(entity this);
 
@@ -106,13 +111,15 @@ void UpdateItemAfterTeleport(entity this);
 float generic_pickupevalfunc(entity player, entity item);// {return item.bot_pickupbasevalue;} // WEAPONTODO
 
 float weapon_pickupevalfunc(entity player, entity item);
-
-float commodity_pickupevalfunc(entity player, entity item);
+float ammo_pickupevalfunc(entity player, entity item);
+float healtharmor_pickupevalfunc(entity player, entity item);
 
 .float is_item;
 .entity itemdef;
 void _StartItem(entity this, entity def, float defaultrespawntime, float defaultrespawntimejitter);
 
+void setItemGroup(entity this);
+void setItemGroupCount();
 
 float GiveWeapon(entity e, float wpn, float op, float val);
 
@@ -133,4 +140,3 @@ void GiveRot(entity e, float v0, float v1, .float rotfield, float rottime, .floa
 
 float GiveItems(entity e, float beginarg, float endarg);
 #endif
-#endif