From: terencehill <piuntn@gmail.com>
Date: Wed, 31 Aug 2016 23:20:48 +0000 (+0200)
Subject: Merge branch 'master' into terencehill/scoreboard_update
X-Git-Tag: xonotic-v0.8.2~600^2~9
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=13ef8c684799d97835cac8437ed3d90e85a92e7e;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into terencehill/scoreboard_update
---

13ef8c684799d97835cac8437ed3d90e85a92e7e
diff --cc qcsrc/client/hud/panel/scoreboard.qc
index 8c6a2cbcb,f82c7345c..7d14e9a95
--- a/qcsrc/client/hud/panel/scoreboard.qc
+++ b/qcsrc/client/hud/panel/scoreboard.qc
@@@ -10,9 -10,15 +10,16 @@@
  
  // Scoreboard (#24)
  
+ const int MAX_SBT_FIELDS = MAX_SCORE;
+ 
+ PlayerScoreField sbt_field[MAX_SBT_FIELDS + 1];
+ float sbt_field_size[MAX_SBT_FIELDS + 1];
+ string sbt_field_title[MAX_SBT_FIELDS + 1];
+ int sbt_num_fields;
+ 
  string autocvar_hud_fontsize;
  string hud_fontsize_str;
 +float max_namesize;
  
  float sbt_bg_alpha;
  float sbt_fg_alpha;