From: terencehill <piuntn@gmail.com>
Date: Tue, 23 Aug 2016 14:28:11 +0000 (+0200)
Subject: Display "damage" as column header instead of "dmg" (too short); add "damage" and... 
X-Git-Tag: xonotic-v0.8.2~677
X-Git-Url: http://git.xonotic.org/?a=commitdiff_plain;h=90c3da60a0886f97615684df9f8f6cd990488031;p=xonotic%2Fxonotic-data.pk3dir.git

Display "damage" as column header instead of "dmg" (too short); add "damage" and "damagetaken" keywords for setting custom scoreboard columns (more intuitive)
---

diff --git a/qcsrc/client/hud/panel/scoreboard.qc b/qcsrc/client/hud/panel/scoreboard.qc
index 6f70c47fd..1fcdea2de 100644
--- a/qcsrc/client/hud/panel/scoreboard.qc
+++ b/qcsrc/client/hud/panel/scoreboard.qc
@@ -59,7 +59,7 @@ string TranslateScoresLabel(string l)
 		case "captime": return CTX(_("SCO^captime"));
 		case "deaths": return CTX(_("SCO^deaths"));
 		case "destroyed": return CTX(_("SCO^destroyed"));
-		case "dmg": return CTX(_("SCO^dmg"));
+		case "dmg": return CTX(_("SCO^damage"));
 		case "dmgtaken": return CTX(_("SCO^dmgtaken"));
 		case "drops": return CTX(_("SCO^drops"));
 		case "faults": return CTX(_("SCO^faults"));
@@ -436,8 +436,8 @@ void Cmd_Scoreboard_SetFields(int argc)
 			case "name": case "nick": sbt_field[sbt_num_fields] = SP_NAME; have_name = true; break;
 			case "|": sbt_field[sbt_num_fields] = SP_SEPARATOR; have_separator = true; break;
 			case "elo": sbt_field[sbt_num_fields] = SP_ELO; break;
-			case "dmg": sbt_field[sbt_num_fields] = SP_DMG; break;
-			case "dmgtaken": sbt_field[sbt_num_fields] = SP_DMGTAKEN; break;
+			case "dmg": case "damage": sbt_field[sbt_num_fields] = SP_DMG; break;
+			case "dmgtaken": case "damagetaken": sbt_field[sbt_num_fields] = SP_DMGTAKEN; break;
 			default:
 			{
 				FOREACH(Scores, true, {