From: terencehill <piuntn@gmail.com>
Date: Sat, 28 May 2011 08:52:29 +0000 (+0200)
Subject: Merge branch 'master' into terencehill/centerprint_stuff
X-Git-Tag: xonotic-v0.5.0~215
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=4b2c76f4ddbe8e880e94fb42c5032b106fb5bfb4;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into terencehill/centerprint_stuff

Conflicts:
	qcsrc/client/hud.qc
---

4b2c76f4ddbe8e880e94fb42c5032b106fb5bfb4
diff --cc qcsrc/client/hud.qc
index d5ad7c8a0,a737c82d2..af73ae20c
--- a/qcsrc/client/hud.qc
+++ b/qcsrc/client/hud.qc
@@@ -1855,9 -2034,9 +1855,9 @@@ void HUD_Centerprint(string s1, string 
  	} else if(msg == MSG_KILL) {
  		if (type == KILL_TEAM_RED || type == KILL_TEAM_BLUE) {
  			if(gentle) {
- 				centerprint(strcat(sprintf(_("^1Moron! You went against %s, a team mate!"), s1)));
 -				centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, sprintf(_("^1Moron! You went against ^7%s^1, a team mate!"), s1)));
++				centerprint(strcat(sprintf(_("^1Moron! You went against ^7%s^1, a team mate!"), s1)));
  			} else {
- 				centerprint(strcat(sprintf(_("^1Moron! You fragged %s, a team mate!"), s1)));
 -				centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, sprintf(_("^1Moron! You fragged ^7%s^1, a team mate!"), s1)));
++				centerprint(strcat(sprintf(_("^1Moron! You fragged ^7%s^1, a team mate!"), s1)));
  			}
  		} else if (type == KILL_FIRST_BLOOD) {
  			if(gentle) {