Merge branch 'master' into z411/powerups_drop

diff --cc qcsrc/common/mutators/mutator/powerups/sv_powerups.qc
index 68e2c8c7281d7997f94d1bbc9780bb38ebb900d1,e7bbeeb69c2176048a2820e2349ca6b157a1c7d6..739f197d2c2503ace8ac8939125876c0e06545b6
--- 1/qcsrc/common/mutators/mutator/powerups/sv_powerups.qc
--- 2/qcsrc/common/mutators/mutator/powerups/sv_powerups.qc
+++ b/qcsrc/common/mutators/mutator/powerups/sv_powerups.qc
@@@ -112,7 -112,7 +112,7 @@@ void powerups_DropItem(entity this, Sta
  
        // If the timer is frozen, the item will stay on the floor for 20 secs (same as weapons),
        // otherwise it'll disappear after the timer runs out.
-       float time_to_live = (freezeTimer ? autocvar_g_powerups_dropondeath_ttl : timeleft);
 -      float time_to_live = (autocvar_g_powerups_drop_ondeath == 2 ? autocvar_g_items_dropped_lifetime : timeleft);
++      float time_to_live = (freezeTimer ? autocvar_g_items_dropped_lifetime : timeleft);
  
        // TODO: items cannot hold their "item field" yet, so we need to list all the powerups here!
        switch(item)

diff --cc qcsrc/common/mutators/mutator/powerups/sv_powerups.qh
index 6342037c27fa66fa6cf277916d6e9ebb460ebe41,b7f3b8e40d65d9218f6f4483f2505309eef471de..06098c95ebf1095c3297ab23f57d32608948b652
--- 1/qcsrc/common/mutators/mutator/powerups/sv_powerups.qh
--- 2/qcsrc/common/mutators/mutator/powerups/sv_powerups.qh
+++ b/qcsrc/common/mutators/mutator/powerups/sv_powerups.qh
@@@ -5,9 -5,7 +5,8 @@@
  #include "powerups.qh"
  
  int autocvar_g_powerups;
- int autocvar_g_powerups_dropondeath;
- int autocvar_g_powerups_dropondeath_ttl;
 +int autocvar_g_powerups_drop;
+ int autocvar_g_powerups_drop_ondeath;
  bool autocvar_g_powerups_stack;
  
  REGISTER_MUTATOR(powerups, true);

diff --cc xonotic-server.cfg
index 00cda685a11dd42cab1eb955df3bd7fb6a83a8d4,334f749a2552baf0ab69165c106bbbb2aad469c8..32698b99d3b2d2ed2a04a4ac9d8fd162154cce61
--- 1/xonotic-server.cfg
--- 2/xonotic-server.cfg
+++ b/xonotic-server.cfg
@@@ -198,9 -200,7 +200,8 @@@ set g_shootfromfixedorigin "" "if set t
  set g_weapon_stay 0 "1: ghost weapons can be picked up but give no ammo, thrown guns have ammo 2: ghost weapons can be picked up and refill ammo to one pickup size, thrown guns have no ammo (to prevent infinite ammo abuse)"
  set g_weapon_throwable 1 "if set to 1, weapons can be dropped"
  set g_powerups -1 "if set to 0 no powerups will spawn, if 1 they will spawn in all game modes, -1 is game mode default"
- set g_powerups_drop 0 "allow dropping powerups (1 = timer continues, 2 =  timer freezes untip icked up)"
- set g_powerups_dropondeath 0 "players will drop their powerups on death (1 = timer continues, 2 = timer freezes until picked up)"
- set g_powerups_dropondeath_ttl 20 "seconds before a dropped powerup disappears if dropondeath is set to 2"
++set g_powerups_drop 0 "allow dropping powerups (1 = timer continues, 2 = timer freezes until picked up)"
+ set g_powerups_drop_ondeath 0 "players will drop their powerups on death (1 = timer continues, 2 = timer freezes until picked up)"
  set g_powerups_stack 0 "enables stacking of powerup timers when picking up a powerup you already have; otherwise timer is reset to the time granted by the item, if greater than the time you currently have"
  set g_powerups_strength 1 "allow strength powerups to spawn"
  set g_powerups_shield 1 "allow shield powerups to spawn"