From: Rudolf Polzer <divverent@xonotic.org>
Date: Thu, 16 Oct 2014 09:50:07 +0000 (+0200)
Subject: Merge branch 'master' into samual/weapons
X-Git-Tag: xonotic-v0.8.0~152^2~25^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=a5b077eb799e456094034cdc0dd0d5b5a7e1119e;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into samual/weapons

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

a5b077eb799e456094034cdc0dd0d5b5a7e1119e
diff --cc qcsrc/client/hud.qc
index a6d06d783,9faf59445..811b3649c
--- a/qcsrc/client/hud.qc
+++ b/qcsrc/client/hud.qc
@@@ -1636,15 -1702,10 +1662,10 @@@ void HUD_Notify(void
  	{
  		if(autocvar__hud_configure)
  		{
- 			if (step == +1)
- 				a = i;
- 			else // inverse order
- 				a = entries - 1 - i;
- 			attacker = textShortenToWidth(sprintf(_("Player %d"), a+1), 0.48 * mySize_x - height, fontsize, stringwidth_colors);
- 			victim = textShortenToWidth(sprintf(_("Player %d"), a+2), 0.48 * mySize_x - height, fontsize, stringwidth_colors);
- 			icon = get_weaponinfo(WEP_FIRST + mod(floor(a*2.4), WEP_LAST)).model2;
- 			a = bound(0, (when - a) / 4, 1);
- 			goto hud_config_notifyprint;
+ 			attacker = sprintf(_("Player %d"), count + 1);
+ 			victim = sprintf(_("Player %d"), count + 2);
 -			icon = strcat("weapon", get_weaponinfo(min(WEP_FIRST + count * 2, WEP_LAST)).netname);
++			icon = get_weaponinfo(min(WEP_FIRST + count * 2, WEP_LAST)).model2;
+ 			alpha = bound(0, 1.2 - count / entry_count, 1);
  		}
  		else
  		{