From: Mario <mario@smbclan.net>
Date: Mon, 12 Dec 2016 14:02:45 +0000 (+1000)
Subject: Merge branch 'master' into Mario/wepent_experimental
X-Git-Tag: xonotic-v0.8.2~326^2~27
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=0f6c4bee8db75b0aded48382af1c2693b19624de;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into Mario/wepent_experimental
---

0f6c4bee8db75b0aded48382af1c2693b19624de
diff --cc mutators.cfg
index 23d0a6fb2,781377637..f36a5a774
--- a/mutators.cfg
+++ b/mutators.cfg
@@@ -53,8 -53,24 +53,8 @@@ set g_overkill_powerups_replace 
  set g_overkill_filter_healthmega 0
  set g_overkill_filter_armormedium 0
  set g_overkill_filter_armorbig 0
- set g_overkill_filter_armorlarge 0
+ set g_overkill_filter_armormega 0
  
 -set g_overkill_ammo_charge 0
 -set g_overkill_ammo_charge_notice 1
 -set g_overkill_ammo_charge_limit 1
 -set g_overkill_ammo_charge_rate 0.5
 -set g_overkill_ammo_charge_rate_vortex 0.5
 -set g_overkill_ammo_charge_rate_machinegun 0.5
 -set g_overkill_ammo_charge_rate_shotgun 0.5
 -set g_overkill_ammo_charge_rate_hmg 0.25
 -set g_overkill_ammo_charge_rate_rpc 1.5
 -set g_overkill_ammo_decharge 0.1
 -set g_overkill_ammo_decharge_machinegun 0.025
 -set g_overkill_ammo_decharge_shotgun 0.15
 -set g_overkill_ammo_decharge_vortex 0.2
 -set g_overkill_ammo_decharge_rpc 1
 -set g_overkill_ammo_decharge_hmg 0.01
 -
  
  // =========
  //  vampire
diff --cc qcsrc/common/mutators/mutator/overkill/sv_overkill.qc
index 85beb641f,56bc8d14c..9bc39781b
--- a/qcsrc/common/mutators/mutator/overkill/sv_overkill.qc
+++ b/qcsrc/common/mutators/mutator/overkill/sv_overkill.qc
@@@ -8,11 -11,17 +8,11 @@@ bool autocvar_g_overkill_powerups_repla
  bool autocvar_g_overkill_filter_healthmega;
  bool autocvar_g_overkill_filter_armormedium;
  bool autocvar_g_overkill_filter_armorbig;
- bool autocvar_g_overkill_filter_armorlarge;
+ bool autocvar_g_overkill_filter_armormega;
  
 -.float ok_lastwep;
  .float ok_item;
  
 -.float ok_notice_time;
 -.float ammo_charge[Weapons_MAX];
 -.float ok_use_ammocharge = _STAT(OK_AMMO_CHARGE);
 -.float ok_ammo_charge = _STAT(OK_AMMO_CHARGEPOOL);
 -
 -void(entity ent, float wep) ok_DecreaseCharge;
 +.Weapon ok_lastwep[MAX_WEAPONSLOTS];
  
  void ok_Initialize();
  
diff --cc qcsrc/common/stats.qh
index c4c5172aa,b3459a67b..995923a5e
--- a/qcsrc/common/stats.qh
+++ b/qcsrc/common/stats.qh
@@@ -55,11 -55,18 +55,12 @@@ REGISTER_STAT(PL_CROUCH_MAX, vector, au
  
  REGISTER_STAT(KH_KEYS, int)
  
 -/** weapon requested to switch to; next WANTED weapon (for HUD) */
 -REGISTER_STAT(SWITCHWEAPON, int)
 -/** weapon currently being switched to (is copied from switchweapon once switch is possible) */
 -REGISTER_STAT(SWITCHINGWEAPON, int)
 -REGISTER_STAT(WEAPON_NEXTTHINK, float)
  #ifdef SVQC
 -SPECTATE_COPYFIELD(_STAT(WEAPON_NEXTTHINK))
  float W_WeaponRateFactor(entity this);
+ float gameover;
  #endif
  REGISTER_STAT(WEAPONRATEFACTOR, float, W_WeaponRateFactor(this))
- 
+ REGISTER_STAT(GAMEOVER, int, gameover)
  REGISTER_STAT(GAMESTARTTIME, float)
  REGISTER_STAT(STRENGTH_FINISHED, float)
  REGISTER_STAT(INVINCIBLE_FINISHED, float)
diff --cc qcsrc/server/g_hook.qc
index 36e1e4e52,cccba42bb..a69b98487
--- a/qcsrc/server/g_hook.qc
+++ b/qcsrc/server/g_hook.qc
@@@ -163,9 -144,9 +163,9 @@@ void GrapplingHookThink(entity this
  		error("Owner lost the hook!\n");
  		return;
  	}
- 	if(LostMovetypeFollow(this) || intermission_running || (round_handler_IsActive() && !round_handler_IsRoundStarted()) || ((this.aiment.flags & FL_PROJECTILE) && this.aiment.classname != "nade"))
+ 	if(LostMovetypeFollow(this) || gameover || (round_handler_IsActive() && !round_handler_IsRoundStarted()) || ((this.aiment.flags & FL_PROJECTILE) && this.aiment.classname != "nade"))
  	{
 -		RemoveGrapplingHook(this.realowner);
 +		RemoveHook(this);
  		return;
  	}
  	if(this.aiment)