]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge branch 'master' into terencehill/scoreboard_update
authorterencehill <piuntn@gmail.com>
Wed, 31 Aug 2016 23:20:48 +0000 (01:20 +0200)
committerterencehill <piuntn@gmail.com>
Wed, 31 Aug 2016 23:20:48 +0000 (01:20 +0200)
1  2 
qcsrc/client/hud/panel/scoreboard.qc

index 8c6a2cbcb8e5dc6cb7e3318aff26cadc6e7c0808,f82c7345ca0c7d3afdc84102cd5a728afa54c6ed..7d14e9a95f448ab9224ef318ac184e00cf130dcd
  
  // 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;