Resolve conflicts 1: Merge commit 'c58baab5' into bones_was_here/q3compat

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / items / items.qh

diff --git a/qcsrc/server/items/items.qh b/qcsrc/server/items/items.qh
index 39009fe90f3e62b8c7b0251f302ff2845b583d58..aaa5f93058b1c7919e7eb0ecfbda8ebcaf6de7c9 100644 (file)
--- a/qcsrc/server/items/items.qh
+++ b/qcsrc/server/items/items.qh
@@ -29,6 +29,7 @@ const float ITEM_RESPAWN_TICKS = 10;
 
 .float max_armorvalue;
 .float pickup_anyway;
+.int count;
 
 .float scheduledrespawntime;
 .float respawntime;