From: Martin Taibr <taibr.martin@gmail.com>
Date: Sat, 23 Sep 2017 16:03:48 +0000 (+0200)
Subject: Merge branch 'master' into martin-t/uncrustify
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=598e7bb7bad2d90db6916173e94af74d1ad4bc73;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into martin-t/uncrustify
---

598e7bb7bad2d90db6916173e94af74d1ad4bc73
diff --cc qcsrc/server/scores.qc
index c62e23d7c,b25a65f1a..7951a12e8
--- a/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)