Merge remote-tracking branch 'origin/Mario/extralife_fix'

diff --git a/qcsrc/server/t_items.qc b/qcsrc/server/t_items.qc
index 2cc9e1f4355200847756cd0bd9e5b948281a8138..cb6700a2cfb60a3a5e2e289ff82761976dada93a 100644 (file)
--- a/qcsrc/server/t_items.qc
+++ b/qcsrc/server/t_items.qc
@@ -651,6 +651,11 @@ float Item_GiveTo(entity item, entity player)
                pickedup = TRUE;
                player.superweapons_finished = max(player.superweapons_finished, time) + item.superweapons_finished;
        }
+       if (item.max_health)
+       {
+               pickedup = TRUE;
+               // extra life powerup handled by mutators
+       }
 
 :skip