From: Juhu <5894800-Juhu_@users.noreply.gitlab.com>
Date: Mon, 27 Mar 2023 16:43:38 +0000 (+0200)
Subject: Merge branch 'master' into Juhu/scoreboard-strafe
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=e34dc654ebfaab972925df7d412e57063ad8b700;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into Juhu/scoreboard-strafe

Fixed compile error caused by new speed unit cvar
---

e34dc654ebfaab972925df7d412e57063ad8b700
diff --cc .gitlab-ci.yml
index 73b134360,8ba5c1806..6f5c8c2d5
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@@ -69,7 -75,7 +75,7 @@@ test_sv_game
      - wget -nv -O data/maps/stormkeep.waypoints https://gitlab.com/xonotic/xonotic-maps.pk3dir/raw/master/maps/stormkeep.waypoints
      - wget -nv -O data/maps/stormkeep.waypoints.cache https://gitlab.com/xonotic/xonotic-maps.pk3dir/raw/master/maps/stormkeep.waypoints.cache
  
-     - EXPECT=ac76f7e463a6e7ae72992e8ff2ab88f5
 -    - EXPECT=fe5dec36cb304c55acee73afd1e09c0a
++    - EXPECT=3db0ae13a7c4437997f04036773b6b3e
      - HASH=$(${ENGINE} +timestamps 1 +exec serverbench.cfg
        | tee /dev/stderr
        | sed -e 's,^\[[^]]*\] ,,'
diff --cc qcsrc/client/hud/panel/scoreboard.qc
index 36370a7b0,484968a9c..d22dc5f09
--- a/qcsrc/client/hud/panel/scoreboard.qc
+++ b/qcsrc/client/hud/panel/scoreboard.qc
@@@ -1074,23 -1070,6 +1074,23 @@@ string Scoreboard_GetField(entity pl, P
  		case SP_DMG: case SP_DMGTAKEN:
  			return sprintf("%.1f k", pl.(scores(field)) / 1000);
  
 +		case SP_CTS_STRAFE:
 +		{
 +			float strafe_efficiency = pl.(scores(field)) / 1000;
 +			if(strafe_efficiency < -1) return "";
 +			sbt_field_rgb = '1 1 1' - (strafe_efficiency > 0 ? '1 0 1' : '0 1 1') * fabs(strafe_efficiency);
 +			return sprintf("%.1f%%", strafe_efficiency * 100);
 +		}
 +
 +		case SP_CTS_STARTSPEED:
 +		case SP_CTS_AVGSPEED:
 +		case SP_CTS_TOPSPEED:
 +		{
- 			float speed = pl.(scores(field)) * GetSpeedUnitFactor(autocvar_hud_panel_physics_speed_unit);
++			float speed = pl.(scores(field)) * GetSpeedUnitFactor(autocvar_hud_speed_unit);
 +			if(speed < 0) return "";
- 			return sprintf("%d%s", speed, GetSpeedUnit(autocvar_hud_panel_physics_speed_unit));
++			return sprintf("%d%s", speed, GetSpeedUnit(autocvar_hud_speed_unit));
 +		}
 +
  		default: case SP_SCORE:
  			tmp = pl.(scores(field));
  			f = scores_flags(field);