Merge branch 'master' into martin-t/uncrustify

diff --cc qcsrc/client/hud/panel/weapons.qc
Simple merge

diff --cc qcsrc/common/weapons/all.qc
Simple merge

diff --cc qcsrc/common/weapons/weapon/crylink.qc
Simple merge

diff --cc qcsrc/server/miscfunctions.qc
Simple merge

diff --cc qcsrc/server/scores.qc
index c62e23d7c111942989e5837719b8e52fdfe2a611,b25a65f1a7c127f348e897c392d4db2f00fb6734..7951a12e8d2c125d3687b76ae4d728bae51652d2
--- 1/qcsrc/server/scores.qc
--- 2/qcsrc/server/scores.qc
+++ b/qcsrc/server/scores.qc
@@@ -345,10 -345,12 +345,12 @@@ float PlayerScore_Add(entity player, Pl
                return s.(scores(scorefield));
        }
        if(scores_label(scorefield) != "")
 -              s.SendFlags |= (2 ** (scorefield.m_id % 16));
 +              s.SendFlags |= POW(2, (scorefield.m_id % 16));
        if(!warmup_stage)
                PS_GR_P_ADDVAL(s.owner, strcat(PLAYERSTATS_TOTAL, scores_label(scorefield)), score);
-       return (s.(scores(scorefield)) += score);
+       s.(scores(scorefield)) += score;
+       MUTATOR_CALLHOOK(AddedPlayerScore, scorefield, score, player);
+       return s.(scores(scorefield));
  }
  
  float PlayerTeamScore_Add(entity player, PlayerScoreField pscorefield, float tscorefield, float score)