From: terencehill <piuntn@gmail.com>
Date: Sat, 26 Mar 2016 00:08:01 +0000 (+0100)
Subject: Merge branch 'master' into terencehill/hud_fixes
X-Git-Tag: xonotic-v0.8.2~1015^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=refs%2Fmerge-requests%2F294%2Fhead;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into terencehill/hud_fixes

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

109c5785a22fb4336ac5e91d5f1fa91678582164
diff --cc qcsrc/client/hud/panel/racetimer.qc
index ca45f352f,7a9f90f9a..365ba01dd
--- a/qcsrc/client/hud/panel/racetimer.qc
+++ b/qcsrc/client/hud/panel/racetimer.qc
@@@ -1,74 -1,8 +1,79 @@@
+ #include "racetimer.qh"
+ 
+ #include <common/mapinfo.qh>
+ 
  /** Race timer (#8) */
 +
 +// return the string of the onscreen race timer
 +string MakeRaceString(int cp, float mytime, float theirtime, float lapdelta, string theirname)
 +{
++	TC(int, cp);
 +	string col;
 +	string timestr;
 +	string cpname;
 +	string lapstr;
 +	lapstr = "";
 +
 +	if(theirtime == 0) // goal hit
 +	{
 +		if(mytime > 0)
 +		{
 +			timestr = strcat("+", ftos_decimals(+mytime, TIME_DECIMALS));
 +			col = "^1";
 +		}
 +		else if(mytime == 0)
 +		{
 +			timestr = "+0.0";
 +			col = "^3";
 +		}
 +		else
 +		{
 +			timestr = strcat("-", ftos_decimals(-mytime, TIME_DECIMALS));
 +			col = "^2";
 +		}
 +
 +		if(lapdelta > 0)
 +		{
 +			lapstr = sprintf(_(" (-%dL)"), lapdelta);
 +			col = "^2";
 +		}
 +		else if(lapdelta < 0)
 +		{
 +			lapstr = sprintf(_(" (+%dL)"), -lapdelta);
 +			col = "^1";
 +		}
 +	}
 +	else if(theirtime > 0) // anticipation
 +	{
 +		if(mytime >= theirtime)
 +			timestr = strcat("+", ftos_decimals(mytime - theirtime, TIME_DECIMALS));
 +		else
 +			timestr = TIME_ENCODED_TOSTRING(TIME_ENCODE(theirtime));
 +		col = "^3";
 +	}
 +	else
 +	{
 +		col = "^7";
 +		timestr = "";
 +	}
 +
 +	if(cp == 254)
 +		cpname = _("Start line");
 +	else if(cp == 255)
 +		cpname = _("Finish line");
 +	else if(cp)
 +		cpname = sprintf(_("Intermediate %d"), cp);
 +	else
 +		cpname = _("Finish line");
 +
 +	if(theirtime < 0)
 +		return strcat(col, cpname);
 +	else if(theirname == "")
 +		return strcat(col, sprintf("%s (%s)", cpname, timestr));
 +	else
 +		return strcat(col, sprintf("%s (%s %s)", cpname, timestr, strcat(theirname, col, lapstr)));
 +}
 +
  void HUD_RaceTimer ()
  {
  	if(!autocvar__hud_configure)