From: terencehill <piuntn@gmail.com>
Date: Fri, 28 Nov 2014 17:39:44 +0000 (+0100)
Subject: Make HUD_DefaultColumnLayout into a macro to avoid future issues with strcat
X-Git-Tag: xonotic-v0.8.0~130^2~3
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=869903f765fa71fbf2631a81f4c2d6f1b453ffe2;p=xonotic%2Fxonotic-data.pk3dir.git

Make HUD_DefaultColumnLayout into a macro to avoid future issues with strcat
---

diff --git a/qcsrc/client/scoreboard.qc b/qcsrc/client/scoreboard.qc
index d1d06b186..83971f476 100644
--- a/qcsrc/client/scoreboard.qc
+++ b/qcsrc/client/scoreboard.qc
@@ -287,18 +287,15 @@ void Cmd_HUD_Help()
 	        "other gamemodes except DM.\n"));
 }
 
-string HUD_DefaultColumnLayout()
-{
-	return strcat( // fteqcc sucks
-		"ping pl name | ",
-		"-teams,race,lms/kills +freezetag,tdm/kills -teams,lms/deaths +freezetag,tdm/deaths -teams,lms,race,ka/suicides +freezetag,tdm/suicides -race,dm,tdm,ka,freezetag/frags ", // tdm already has this in "score"
-		"+ctf/caps +ctf/pickups +ctf/fckills +ctf/returns ",
-		"+lms/lives +lms/rank ",
-		"+kh/caps +kh/pushes +kh/destroyed ",
-		"?+race/laps ?+race/time ?+race/fastest ",
-		"+as/objectives +nexball/faults +nexball/goals +ka/pickups +ka/bckills +ka/bctime +freezetag/revivals ",
-		"-lms,race,nexball/score");
-}
+#define HUD_DefaultColumnLayout() \
+"ping pl name | " \
+"-teams,race,lms/kills +freezetag,tdm/kills -teams,lms/deaths +freezetag,tdm/deaths -teams,lms,race,ka/suicides +freezetag,tdm/suicides -race,dm,tdm,ka,freezetag/frags " /* tdm already has this in "score" */ \
+"+ctf/caps +ctf/pickups +ctf/fckills +ctf/returns " \
+"+lms/lives +lms/rank " \
+"+kh/caps +kh/pushes +kh/destroyed " \
+"?+race/laps ?+race/time ?+race/fastest " \
+"+as/objectives +nexball/faults +nexball/goals +ka/pickups +ka/bckills +ka/bctime +freezetag/revivals " \
+"-lms,race,nexball/score"
 
 void Cmd_HUD_SetFields(float argc)
 {