From: Mario <mario@smbclan.net>
Date: Sat, 5 Nov 2016 02:43:35 +0000 (+1000)
Subject: Merge branch 'master' into Mario/wepent_experimental
X-Git-Tag: xonotic-v0.8.2~326^2~35
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=cd4892b9fcd32bd4887f0b3bc2503894520945c7;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into Mario/wepent_experimental

# Conflicts:
#	qcsrc/client/view.qc
#	qcsrc/common/weapons/weapon/tuba.qc
---

cd4892b9fcd32bd4887f0b3bc2503894520945c7
diff --cc qcsrc/common/weapons/weapon/hagar.qc
index aa564565b,684ee75d3..eff656a6e
--- a/qcsrc/common/weapons/weapon/hagar.qc
+++ b/qcsrc/common/weapons/weapon/hagar.qc
@@@ -316,10 -313,10 +316,10 @@@ void W_Hagar_Attack2_Load(Weapon thiswe
  {
  	// loadable hagar secondary attack, must always run each frame
  
- 	if(time < game_starttime || PS(actor).m_switchweapon != WEP_HAGAR)
+ 	if(time < game_starttime)
  		return;
  
 -	bool loaded = actor.hagar_load >= WEP_CVAR_SEC(hagar, load_max);
 +	bool loaded = actor.(weaponentity).hagar_load >= WEP_CVAR_SEC(hagar, load_max);
  
  	// this is different than WR_CHECKAMMO when it comes to reloading
  	bool enough_ammo;