From: Samual Lenks <samual@xonotic.org>
Date: Wed, 12 Dec 2012 21:52:52 +0000 (-0500)
Subject: Merge remote-tracking branch 'origin/terencehill/cmd_fixes'
X-Git-Tag: xonotic-v0.7.0~194
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=64b6c7420b3e1c307f408a9f17d9c765a268621a;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote-tracking branch 'origin/terencehill/cmd_fixes'

Conflicts:
	qcsrc/client/scoreboard.qc
	qcsrc/server/g_world.qc
---

64b6c7420b3e1c307f408a9f17d9c765a268621a
diff --cc qcsrc/client/scoreboard.qc
index 364f9e969,4aaefb0d6..83991f6f1
--- a/qcsrc/client/scoreboard.qc
+++ b/qcsrc/client/scoreboard.qc
@@@ -341,10 -339,9 +341,10 @@@ void Cmd_HUD_SetFields(float argc
  
  	hud_num_fields = 0;
  
- 	hud_fontsize = HUD_GetFontsize("hud_fontsize");	
+ 	hud_fontsize = HUD_GetFontsize("hud_fontsize");
  
 +	draw_beginBoldFont();
- 	for(i = 0; i < argc - 1; ++i)
+ 	for(i = 1; i < argc - 1; ++i)
  	{
  		float nocomplain;
  		str = argv(i+1);
diff --cc qcsrc/server/g_world.qc
index 69bf57d51,b3aff8476..a41389a4f
--- a/qcsrc/server/g_world.qc
+++ b/qcsrc/server/g_world.qc
@@@ -831,9 -817,6 +831,9 @@@ void spawnfunc_worldspawn (void
  	addstat(STAT_SECRETS_TOTAL, AS_FLOAT, stat_secrets_total);
  	addstat(STAT_SECRETS_FOUND, AS_FLOAT, stat_secrets_found);
  
 +	// misc
 +	addstat(STAT_RESPAWN_TIME, AS_FLOAT, stat_respawn_time);
- 	
++
  	next_pingtime = time + 5;
  
  	detect_maptype();