Merge branch 'master' into terencehill/scoreboard_panel_2

diff --cc qcsrc/client/main.qc
index b5c841a36bea5a9585408cd48847e763ff6f1550,4021161732b422ad9fc88c719d25ffbaf16d9d44..517a09549fa124381d5ffa84ab27bb5ec0d4f3e5
--- 1/qcsrc/client/main.qc
--- 2/qcsrc/client/main.qc
+++ b/qcsrc/client/main.qc
@@@ -131,13 -130,13 +130,13 @@@ void CSQC_Init(
  
        registercvar("cl_spawn_near_teammate", "1");
  
-       gametype = 0;
+       gametype = NULL;
  
 -      // hud_fields uses strunzone on the titles!
 -      for(int i = 0; i < MAX_HUD_FIELDS; ++i)
 -              hud_title[i] = strzone("(null)");
 +      // sbt_fields uses strunzone on the titles!
 +      for(int i = 0; i < MAX_SBT_FIELDS; ++i)
 +              sbt_field_title[i] = strzone("(null)");
  
 -      Cmd_HUD_SetFields(0);
 +      Cmd_Scoreboard_SetFields(0);
  
        postinit = false;
  

diff --cc qcsrc/client/main.qh
Simple merge

diff --cc qcsrc/client/mapvoting.qc
Simple merge