From: Debugger <pyngot@hotmail.com>
Date: Wed, 4 Sep 2013 23:10:26 +0000 (+0200)
Subject: rename net into sum
X-Git-Tag: xonotic-v0.8.0~347^2~1
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=dd919fdd8256ce5a92843d969b7eaea34c0c5da0;p=xonotic%2Fxonotic-data.pk3dir.git

rename net into sum
---

diff --git a/qcsrc/client/main.qh b/qcsrc/client/main.qh
index 8cb8c770c..a573dcc92 100644
--- a/qcsrc/client/main.qh
+++ b/qcsrc/client/main.qh
@@ -54,7 +54,7 @@ float gametype;
 #define SP_CLRATIO -5
 #define SP_PL -6
 #define SP_FRAGS -7
-#define SP_NET -8
+#define SP_SUM -8
 
 #define SP_SEPARATOR -100
 
diff --git a/qcsrc/client/scoreboard.qc b/qcsrc/client/scoreboard.qc
index 3982a99e9..f98d680f0 100644
--- a/qcsrc/client/scoreboard.qc
+++ b/qcsrc/client/scoreboard.qc
@@ -36,7 +36,7 @@ string TranslateScoresLabel(string l)
 		case "lives": return CTX(_("SCO^lives"));
 		case "losses": return CTX(_("SCO^losses"));
 		case "name": return CTX(_("SCO^name"));
-		case "net": return CTX(_("SCO^net"));
+		case "sum": return CTX(_("SCO^sum"));
 		case "nick": return CTX(_("SCO^nick"));
 		case "objectives": return CTX(_("SCO^objectives"));
 		case "pickups": return CTX(_("SCO^pickups"));
@@ -264,7 +264,7 @@ void Cmd_HUD_Help()
 	print(_("^3suicides^7                 Number of suicides\n"));
 	print(_("^3frags^7                    kills - suicides\n"));
 	print(_("^3kd^7                       The kill-death ratio\n"));
-	print(_("^3net^7                      frags - deaths\n"));
+	print(_("^3sum^7                      frags - deaths\n"));
 	print(_("^3caps^7                     How often a flag (CTF) or a key (KeyHunt) was captured\n"));
 	print(_("^3pickups^7                  How often a flag (CTF) or a key (KeyHunt) or a ball (Keepaway) was picked up\n"));
 	print(_("^3captime^7                  Time of fastest cap (CTF)\n"));
@@ -390,8 +390,8 @@ void Cmd_HUD_SetFields(float argc)
 			hud_field[hud_num_fields] = SP_PL;
 		} else if(str == "kd" || str == "kdr" || str == "kdratio" || str == "k/d") {
 			hud_field[hud_num_fields] = SP_KDRATIO;
-		} else if(str == "net" || str == "net" || str == "net" || str == "f-d") {
-			hud_field[hud_num_fields] = SP_NET;
+		} else if(str == "sum" || str == "diff" || str == "f-d") {
+			hud_field[hud_num_fields] = SP_SUM;
 		} else if(str == "name" || str == "nick") {
 			hud_field[hud_num_fields] = SP_NAME;
 			have_name = 1;
@@ -587,7 +587,7 @@ string HUD_GetField(entity pl, float field)
 				str = sprintf("%.1f", num/denom);
 			return str;
 			
-		case SP_NET:
+		case SP_SUM:
 			f = pl.(scores[SP_KILLS]);
 			f -= pl.(scores[SP_DEATHS]);