From: terencehill <piuntn@gmail.com>
Date: Wed, 10 Aug 2016 13:40:54 +0000 (+0200)
Subject: Merge branch 'master' into terencehill/scoreboard_panel_2
X-Git-Tag: xonotic-v0.8.2~716^2~5
X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=6585b5a8ef2ce4ee66826df826a6c759bd815cb8

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

6585b5a8ef2ce4ee66826df826a6c759bd815cb8
diff --cc qcsrc/client/main.qc
index b5c841a36,402116173..517a09549
--- a/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;