X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Ft_items.qh;h=bc632ece4ab6eafb6ab4c172ab67e675b3d35724;hb=8643336b62c2c2881987dabddc842a0214839012;hp=ae4ecdb769375b17065136d95373c6411a9f7296;hpb=5d60a0a60d9b102d640cc6dd55c718bbb707e4fe;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/server/t_items.qh b/qcsrc/server/t_items.qh index ae4ecdb76..bc632ece4 100644 --- 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,6 +90,13 @@ 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; bool ItemSend(entity to, int sf); @@ -100,6 +113,10 @@ const float ITEM_RESPAWN_TICKS = 10; .float max_armorvalue; .float pickup_anyway; +void Item_ItemsTime_Get(entity e); + +void Item_ItemsTime_ResetForPlayer(entity e); + void Item_Show (entity e, float mode); void Item_Respawn (void);