From: Samual <samual@xonotic.org>
Date: Sat, 12 Feb 2011 18:27:11 +0000 (-0500)
Subject: Rename "time" to "bctime" in keepaway so that it doesn't conflict with the real time... 
X-Git-Tag: xonotic-v0.5.0~311^2~21^2~3
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=5262b2beb462b5ac434cad6ecfd1bb2162fdf226;p=xonotic%2Fxonotic-data.pk3dir.git

Rename "time" to "bctime" in keepaway so that it doesn't conflict with the real time field
---

diff --git a/qcsrc/client/scoreboard.qc b/qcsrc/client/scoreboard.qc
index c719985d0..7fbea0e6b 100644
--- a/qcsrc/client/scoreboard.qc
+++ b/qcsrc/client/scoreboard.qc
@@ -17,6 +17,7 @@ string TranslateScoresLabel(string l)
 	switch(l)
 	{
 		case "bckills": return CTX(_("SCO^bckills"));
+		case "bctime": return CTX(_("SCO^bctime"));
 		case "caps": return CTX(_("SCO^caps"));
 		case "deaths": return CTX(_("SCO^deaths"));
 		case "destroyed": return CTX(_("SCO^destroyed"));
@@ -293,7 +294,7 @@ string HUD_DefaultColumnLayout()
 		"+lms/lives +lms/rank ",
 		"+kh/caps +kh/pushes +kh/destroyed ",
 		"?+race/laps ?+race/time ?+race/fastest ",
-		"+as/objectives +nexball/faults +nexball/goals +ka/drops +ka/pickups +ka/bckills +ka/time +freezetag/revivals ",
+		"+as/objectives +nexball/faults +nexball/goals +ka/drops +ka/pickups +ka/bckills +ka/bctime +freezetag/revivals ",
 		"-lms,race,nexball/score");
 }
 
diff --git a/qcsrc/server/mutators/gamemode_keepaway.qc b/qcsrc/server/mutators/gamemode_keepaway.qc
index a23169c37..d9eabf0b9 100644
--- a/qcsrc/server/mutators/gamemode_keepaway.qc
+++ b/qcsrc/server/mutators/gamemode_keepaway.qc
@@ -200,7 +200,7 @@ void ka_TimeScoring()
 		if(autocvar_g_keepaway_score_timepoints)
 			PlayerScore_Add(self.owner, SP_SCORE, autocvar_g_keepaway_score_timepoints);
 			
-		PlayerScore_Add(self.owner, SP_KEEPAWAY_TIME, (autocvar_g_keepaway_score_timeinterval / 1)); // interval is divided by 1 so that time always shows "seconds"
+		PlayerScore_Add(self.owner, SP_KEEPAWAY_BCTIME, (autocvar_g_keepaway_score_timeinterval / 1)); // interval is divided by 1 so that time always shows "seconds"
 		self.nextthink = time + autocvar_g_keepaway_score_timeinterval;
 	}
 }
diff --git a/qcsrc/server/scores_rules.qc b/qcsrc/server/scores_rules.qc
index 18c780d81..aaaed20c4 100644
--- a/qcsrc/server/scores_rules.qc
+++ b/qcsrc/server/scores_rules.qc
@@ -191,14 +191,14 @@ void ScoreRules_nexball(float teams)
 #define SP_KEEPAWAY_PICKUPS 4
 #define SP_KEEPAWAY_CARRIERKILLS 5
 #define SP_KEEPAWAY_DROPS 6
-#define SP_KEEPAWAY_TIME 7
+#define SP_KEEPAWAY_BCTIME 7
 void ScoreRules_keepaway()
 {
 	ScoreRules_basics(0, SFL_SORT_PRIO_PRIMARY, 0, TRUE); // SFL_SORT_PRIO_PRIMARY
 	ScoreInfo_SetLabel_PlayerScore(SP_KEEPAWAY_PICKUPS,			"pickups",		0);
 	ScoreInfo_SetLabel_PlayerScore(SP_KEEPAWAY_CARRIERKILLS,	"bckills",		0);
 	ScoreInfo_SetLabel_PlayerScore(SP_KEEPAWAY_DROPS,			"drops",		SFL_LOWER_IS_BETTER);
-	ScoreInfo_SetLabel_PlayerScore(SP_KEEPAWAY_TIME,			"time",			SFL_SORT_PRIO_SECONDARY);
+	ScoreInfo_SetLabel_PlayerScore(SP_KEEPAWAY_BCTIME,			"bctime",			SFL_SORT_PRIO_SECONDARY);
 	ScoreRules_basics_end();
 }