Resolve conflicts 2: Merge branch 'master' 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 ff2d138437658ed1e941f2c06dc5f0b10eb15a33..7a472aa94cd7f9ccbec9ab96548ca71f508a1227 100644 (file)
--- a/qcsrc/server/items/items.qh
+++ b/qcsrc/server/items/items.qh
@@ -28,6 +28,7 @@ const float ITEM_RESPAWN_TICKS = 10;
 
 .float max_armorvalue;
 .float pickup_anyway;
+.int count;
 
 .float scheduledrespawntime;
 .float respawntime;