Merge branch 'master' into Mario/wepent_experimental
authorMario <mario@smbclan.net>
Sat, 5 Nov 2016 02:43:35 +0000 (12:43 +1000)
committerMario <mario@smbclan.net>
Sat, 5 Nov 2016 02:43:35 +0000 (12:43 +1000)
# Conflicts:
# qcsrc/client/view.qc
# qcsrc/common/weapons/weapon/tuba.qc

13 files changed:
1  2 
qcsrc/client/defs.qh
qcsrc/client/main.qc
qcsrc/client/view.qc
qcsrc/common/weapons/weapon/hagar.qc
qcsrc/common/weapons/weapon/tuba.qc
qcsrc/server/bot/default/havocbot/havocbot.qc
qcsrc/server/client.qc
qcsrc/server/g_hook.qc
qcsrc/server/g_world.qc
qcsrc/server/miscfunctions.qc
qcsrc/server/weapons/selection.qc
qcsrc/server/weapons/tracing.qc
qcsrc/server/weapons/weaponsystem.qc

Simple merge
Simple merge
Simple merge
@@@ -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;
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge